1. anatoly techtonik
  2. scons-all-branches

Commits

David Cournapeau  committed ec0d69c

Damn, I hate how tools handle cvar: set STATICLINK/DYNAMICLINK even if env has it, but set to empty string.

  • Participants
  • Parent commits 7ee76fb
  • Branches libwithcontext

Comments (0)

Files changed (2)

File src/engine/SCons/Tool/gnulink.py

View file
  • Ignore whitespace
     env['RPATHSUFFIX'] = ''
     env['_RPATH'] = '${_concat(RPATHPREFIX, RPATH, RPATHSUFFIX, __env__)}'
     
-    if not env.has_key('DYNAMICLINK'):
+    if not env['DYNAMICLINK']:
         env['DYNAMICLINK'] = '-Wl,-Bdynamic'
-    if not env.has_key('STATICLINK'):
+    if not env['STATICLINK']:
         env['STATICLINK'] = '-Wl,-Bstatic'
 
 def exists(env):

File src/engine/SCons/Tool/sunlink.py

View file
  • Ignore whitespace
     env['RPATHSUFFIX'] = ''
     env['_RPATH'] = '${_concat(RPATHPREFIX, RPATH, RPATHSUFFIX, __env__)}'
 
-    if not env.has_key('DYNAMICLINK'):
+    if not env['DYNAMICLINK']:
         env['DYNAMICLINK'] = '-Bdynamic'
-    if not env.has_key('STATICLINK'):
+    if not env['STATICLINK']:
         env['STATICLINK'] = '-Bstatic'
 
 def exists(env):