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.
36 lines
1.4 KiB
36 lines
1.4 KiB
--- a/SConstruct 2016-12-27 11:10:06.801949538 +0100
|
|
+++ b/SConstruct 2016-12-27 11:12:40.426407713 +0100
|
|
@@ -1557,7 +1557,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=["-fno-omit-frame-pointer",
|
|
"-fno-strict-aliasing",
|
|
- "-ggdb",
|
|
"-pthread",
|
|
"-Wall",
|
|
"-Wsign-compare",
|
|
@@ -1568,8 +1567,9 @@
|
|
if not has_option("disable-warnings-as-errors"):
|
|
env.Append( CCFLAGS=["-Werror"] )
|
|
|
|
- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
|
|
env.Append( LINKFLAGS=["-pthread"] )
|
|
+ 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.
|
|
@@ -1579,10 +1579,10 @@
|
|
env.Append( LINKFLAGS=["-Wl,-z,now"] )
|
|
env.Append( LINKFLAGS=["-rdynamic"] )
|
|
|
|
- env.Append( LIBS=[] )
|
|
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
|
|
|
|
- #make scons colorgcc friendly
|
|
- for key in ('HOME', 'TERM'):
|
|
+ #make scons colorgcc, distcc, ccache friendly
|
|
+ for key in ('HOME', 'PATH', 'TERM'):
|
|
try:
|
|
env['ENV'][key] = os.environ[key]
|
|
except KeyError:
|