From 9cc25e5a150c49f77dc6ad9503ca89ff3c6dfd67 Mon Sep 17 00:00:00 2001
From: Ken Hughes <khughes@pacific.edu>
Date: Fri, 14 Jul 2006 04:13:55 +0000
Subject: Make scons pick up default link flags from previous commit on linux
 platforms; statically-linked python releases won't work otherwise.  Bugfixes
 for #4676 and #4486.

---
 config/linux2-config.py | 3 +--
 tools/Blender.py        | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/linux2-config.py b/config/linux2-config.py
index 9cff1e13f47..0b6deab2c8d 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -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']
diff --git a/tools/Blender.py b/tools/Blender.py
index a5a0101d486..203635e14f6 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -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'])
-- 
cgit v1.2.3