31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
|
--- a/SConstruct 2019-08-21 09:25:00.980260318 +0200
|
||
|
|
+++ b/SConstruct 2019-08-21 09:27:53.653601283 +0200
|
||
|
|
@@ -1858,7 +1858,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" if not env.TargetOSIs('emscripten') else "-g",
|
||
|
|
"-pthread",
|
||
|
|
"-Wall",
|
||
|
|
"-Wsign-compare",
|
||
|
|
@@ -1870,6 +1869,8 @@
|
||
|
|
env.Append( CCFLAGS=["-Werror"] )
|
||
|
|
|
||
|
|
env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
|
||
|
|
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
|
||
|
|
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
|
||
|
|
if env.ToolchainIs('clang'):
|
||
|
|
env.Append( CXXFLAGS=['-Werror=unused-result'] )
|
||
|
|
|
||
|
|
@@ -1890,8 +1891,8 @@
|
||
|
|
|
||
|
|
env.Append( LIBS=[] )
|
||
|
|
|
||
|
|
- #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:
|