Daniele Rondina
f5875512ac
It seems that emerge solver inject py3.7 also if there is py3.6 installed.
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
diff --git a/SConstruct b/SConstruct
|
|
index fe7975b..92659a7 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -1619,7 +1619,6 @@ if env.TargetOSIs('posix'):
|
|
# -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",
|
|
@@ -1631,6 +1630,8 @@ if env.TargetOSIs('posix'):
|
|
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'] )
|
|
|
|
@@ -1650,8 +1651,8 @@ if env.TargetOSIs('posix'):
|
|
|
|
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:
|