diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-15 17:26:32 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-15 17:26:32 +0400 |
| commit | b89026a3028c3a4f1b6e205c249242d17a878f72 (patch) | |
| tree | 25358196e599114d1b0d4b3ecb629ebdfd105034 /build_files/buildbot | |
| parent | 987f6a7d4f8637441cadf1bfe162070b965dbf96 (diff) | |
Correction to 32bit buildslaves
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-i686.py | 4 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc27-i686.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index bbd58150fde..98ae49eeeea 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -162,4 +162,6 @@ WITH_BF_OCEANSIM = True 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'] diff --git a/build_files/buildbot/config/user-config-glibc27-i686.py b/build_files/buildbot/config/user-config-glibc27-i686.py index ce13e136388..78a2725c456 100644 --- a/build_files/buildbot/config/user-config-glibc27-i686.py +++ b/build_files/buildbot/config/user-config-glibc27-i686.py @@ -147,4 +147,6 @@ WITH_BF_OCEANSIM = True 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'] |