TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set Environment CXX earlier

Browse source 
SCons tries to probe the compiler designated by CXX before Environment()
returns.  Set CXX in the call to Environment so that it probes the
correct tool.
This commit is contained in:
Kp 2017-10-14 17:10:30 +00:00
parent 49da5bd5f7
commit 8f4a20e65b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SConstruct
View file

@ -3728,11 +3728,6 @@ class DXXCommon(LazyObjectConstructor):
target_string = ' -o $TARGET'
env = self.env
user_settings = self.user_settings
# Get traditional compiler environment variables
for cc in ('CXX', 'RC'):
value = getattr(user_settings, cc)
if value is not None:
env[cc] = value
# Expand $CXX immediately.
# $CCFLAGS is never used. Remove it.
cxxcom = env['CXXCOM'] \
@ -3850,7 +3845,14 @@ class DXXCommon(LazyObjectConstructor):
def env(self):
platform_settings = self.platform_settings
# Acquire environment object...
env = Environment(ENV = os.environ, tools = platform_settings.tools + ('textfile',))
user_settings = self.user_settings
# Get traditional compiler environment variables
kw = {}
for cc in ('CXX', 'RC'):
value = getattr(user_settings, cc)
if value is not None:
kw[cc] = value
env = Environment(ENV = os.environ, tools = platform_settings.tools + ('textfile',), **kw)
platform_settings.adjust_environment(self, env)
return env