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.
35 lines
1.3 KiB
35 lines
1.3 KiB
--- a/SConstruct 2015-03-17 10:19:58.766530807 +0100
|
|
+++ b/SConstruct 2015-03-17 10:27:58.400062874 +0100
|
|
@@ -853,7 +853,6 @@
|
|
|
|
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
|
|
env.Append( CCFLAGS=["-fPIC",
|
|
- "-ggdb",
|
|
"-pthread",
|
|
"-Wall",
|
|
"-Wsign-compare",
|
|
@@ -861,13 +860,13 @@
|
|
"-Winvalid-pch"] )
|
|
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
|
|
if linux or darwin:
|
|
- env.Append( CCFLAGS=["-pipe"] )
|
|
if not has_option("disable-warnings-as-errors"):
|
|
env.Append( CCFLAGS=["-Werror"] )
|
|
|
|
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
|
|
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
|
|
env.Append( LINKFLAGS=["-fPIC"] )
|
|
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
|
|
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
|
|
|
|
# SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
|
|
# startup.
|
|
@@ -933,7 +932,6 @@
|
|
except OSError:
|
|
pass
|
|
|
|
-env.Prepend(CPPPATH=['$VARIANT_DIR/third_party/gtest-1.7.0/include'])
|
|
|
|
boostSuffixList = ["-mt", ""]
|
|
if get_option("boost-lib-search-suffixes") is not None:
|