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

Rename user_settings.LDFLAGS to user_settings.LINKFLAGS

Browse source 
SConstruct prefers to refer to linker flags for the main executable as
LINKFLAGS, not LDFLAGS.  Rename the internal storage to eliminate a
special case in accessing it.  Continue to use the environment variable
$LDFLAGS as an initial value, since many tools expect to pass linker
flags through $LDFLAGS.
This commit is contained in:
Kp 2017-04-22 21:23:54 +00:00
parent b5915abdcc
commit d0747bd481
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -3043,7 +3043,7 @@ class DXXCommon(LazyObjectConstructor):
'arguments': (
('CPPFLAGS', getenv('CPPFLAGS'), 'C preprocessor flags'),
('CXXFLAGS', getenv('CXXFLAGS'), 'C++ compiler flags'),
('LDFLAGS', getenv('LDFLAGS'), 'Linker flags'),
('LINKFLAGS', getenv('LDFLAGS'), 'Linker flags'),
('LIBS', getenv('LIBS'), 'Libraries to link'),
# These are intentionally undocumented. They are
# meant for developers who know the implications of
@ -3493,12 +3493,10 @@ class DXXCommon(LazyObjectConstructor):
if self.user_settings.editor:
add_flags['CPPPATH'] = ['common/include/editor']
CLVar = SCons.Util.CLVar
for flags in ('CPPFLAGS', 'CXXFLAGS', 'LIBS'):
for flags in ('CPPFLAGS', 'CXXFLAGS', 'LIBS', 'LINKFLAGS'):
value = getattr(self.user_settings, flags)
if value is not None:
add_flags[flags] = CLVar(value)
if self.user_settings.LDFLAGS:
add_flags['LINKFLAGS'] = CLVar(self.user_settings.LDFLAGS)
env.Append(**add_flags)
if self.user_settings.lto:
env.Append(CXXFLAGS = [