You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.3 KiB
63 lines
2.3 KiB
Index: SConstruct |
|
--- SConstruct.orig 2013-04-14 16:53:22.124724000 +0200 |
|
+++ SConstruct 2013-04-14 18:16:55.784987165 +0200 |
|
@@ -719,7 +719,7 @@ |
|
env.Append( CCFLAGS=["-O0", "-fstack-protector"] ) |
|
env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind |
|
else: |
|
- env.Append( CCFLAGS=["-O3"] ) |
|
+ env.Append( CCFLAGS=["-O2"] ) |
|
|
|
if debugLogging: |
|
env.Append( CPPDEFINES=["_DEBUG"] ); |
|
Index: distsrc/client/SConstruct |
|
--- distsrc/client/SConstruct.orig 2013-03-22 20:55:25.000000000 +0100 |
|
+++ distsrc/client/SConstruct 2013-04-14 16:53:22.044712637 +0200 |
|
@@ -62,7 +62,7 @@ |
|
env['DIST_ARCHIVE_SUFFIX'] = '.tgz' |
|
|
|
if nix: |
|
- env.Append(CCFLAGS=["-O3", "-pthread"]) |
|
+ env.Append(CCFLAGS=["-O2", "-pthread"]) |
|
if linux: |
|
env.Append(LINKFLAGS=["-Wl,--as-needed", "-Wl,-zdefs", "-pthread"]) |
|
|
|
Index: src/mongo/SConscript |
|
--- src/mongo/SConscript.orig 2013-03-22 20:55:25.000000000 +0100 |
|
+++ src/mongo/SConscript 2013-04-14 16:53:22.044712637 +0200 |
|
@@ -451,10 +451,6 @@ |
|
|
|
env.Library('stacktrace', 'util/stacktrace.cpp') |
|
|
|
-env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp', |
|
- LIBDEPS=['stacktrace', |
|
- '$BUILD_DIR/mongo/base/base']) |
|
- |
|
serverOnlyFiles += mmapFiles |
|
|
|
serverOnlyFiles += [ "db/stats/snapshots.cpp" ] |
|
Index: src/third_party/SConscript |
|
--- src/third_party/SConscript.orig 2013-03-22 20:55:25.000000000 +0100 |
|
+++ src/third_party/SConscript 2013-04-14 16:53:22.044712637 +0200 |
|
@@ -8,9 +8,12 @@ |
|
] ) |
|
env.Append(CPPPATH='$BUILD_DIR/third_party/s2') |
|
|
|
+conf = Configure(env) |
|
if use_system_version_of_library("pcre"): |
|
env.StaticLibrary( "pcrecpp", ['shim_pcrecpp.cc'], |
|
- SYSLIBDEPS=[ 'pcre' , 'pcrecpp' ] ) |
|
+ SYSLIBDEPS=[ 'pcrecpp' , 'pcre', ] ) |
|
+ conf.CheckLib( "pcrecpp" ) |
|
+ conf.CheckLib( "pcre" ) |
|
else: |
|
env.SConscript('pcre-${PCRE_VERSION}/SConscript') |
|
env.StaticLibrary( "pcrecpp", ['shim_pcrecpp.cc'], |
|
@@ -29,6 +32,7 @@ |
|
if use_system_version_of_library("snappy"): |
|
env.StaticLibrary("shim_snappy", ['shim_snappy.cpp'], |
|
SYSLIBDEPS=['snappy']) |
|
+ conf.CheckLib( "snappy" ) |
|
else: |
|
env.Append(CPPPATH='$BUILD_DIR/third_party/snappy') |
|
env.SConscript('snappy/SConscript')
|
|
|