[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52231] trunk/blender/build_files/buildbot /config: Correction to 32bit buildslaves
Sergey Sharybin
sergey.vfx at gmail.com
Thu Nov 15 14:26:32 CET 2012
Revision: 52231
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52231
Author: nazgul
Date: 2012-11-15 13:26:32 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Correction to 32bit buildslaves
Modified Paths:
--------------
trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py
Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py 2012-11-15 13:24:14 UTC (rev 52230)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py 2012-11-15 13:26:32 UTC (rev 52231)
@@ -162,4 +162,6 @@
BF_DEBUG = False
REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-lrt']
-BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']
+
+if WITH_BF_CYCLES_OSL:
+ BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']
Modified: trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py 2012-11-15 13:24:14 UTC (rev 52230)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc27-i686.py 2012-11-15 13:26:32 UTC (rev 52231)
@@ -147,4 +147,6 @@
BF_DEBUG = False
REL_CCFLAGS = ['-O2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
-BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']
+
+if WITH_BF_CYCLES_OSL:
+ BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive']
More information about the Bf-blender-cvs
mailing list