Make scons pick up default link flags from previous commit on linux platforms;
authorKen Hughes <khughes@pacific.edu>
Fri, 14 Jul 2006 04:13:55 +0000 (04:13 +0000)
committerKen Hughes <khughes@pacific.edu>
Fri, 14 Jul 2006 04:13:55 +0000 (04:13 +0000)
statically-linked python releases won't work otherwise.  Bugfixes for #4676
and #4486.

config/linux2-config.py
tools/Blender.py

index 9cff1e13f47cb98c801131e36e3928cae58ae273..0b6deab2c8d0a75cbcf21aaa49d809ba684de58f 100644 (file)
@@ -4,6 +4,7 @@ BF_PYTHON_VERSION = '2.4'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
 
 WITH_BF_OPENAL = 'true'
 BF_OPENAL = '/usr'
@@ -147,8 +148,6 @@ BF_DEBUG_FLAGS = ''
 BF_BUILDDIR = '../build/linux2'
 BF_INSTALLDIR='../install/linux2'
 
-#Python linking
-PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
 
 #Link against pthread
 PLATFORM_LINKFLAGS = ['-pthread']
index a5a0101d486f716f316ce0d1e87863b70a18ffd6..203635e14f66b4ddc23153f8a187d12bd048539b 100644 (file)
@@ -377,6 +377,9 @@ class BlenderEnvironment(SConsEnvironment):
         lenv = self.Copy()
         if lenv['OURPLATFORM'] in ['win32-vc', 'cygwin']:
             lenv.Append(LINKFLAGS = Split(lenv['PLATFORM_LINKFLAGS']))
+        if  lenv['OURPLATFORM']=='linux2':
+            lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
+            lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
         if  lenv['OURPLATFORM']=='darwin':
             lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
             lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])