diff options
| author | Ken Hughes <khughes@pacific.edu> | 2006-07-14 08:13:55 +0400 |
|---|---|---|
| committer | Ken Hughes <khughes@pacific.edu> | 2006-07-14 08:13:55 +0400 |
| commit | 9cc25e5a150c49f77dc6ad9503ca89ff3c6dfd67 (patch) | |
| tree | 1a5f2e296e9ff546f5666c7c1bfbe36d2141835d /tools | |
| parent | 6a72f9f61dd4a9c5881388623e26a06f4c74efab (diff) | |
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.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 3 |
1 files changed, 3 insertions, 0 deletions
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']) |