diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-15 23:26:11 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-15 23:26:11 +0400 |
| commit | 2007ba687fb7d26d94769b7de0251ee21e191c2c (patch) | |
| tree | 5eaea965f726bc8eff60ca0d7eda1af40ca81256 /build_files/buildbot/config/user-config-glibc211-i686.py | |
| parent | fcc978b7cf59d2065171677fdec7f2ec97adba59 (diff) | |
Enable OSL for linux 32 bit builders, it should work now
Diffstat (limited to 'build_files/buildbot/config/user-config-glibc211-i686.py')
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-i686.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index 98ae49eeeea..2b1af356773 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -120,7 +120,7 @@ BF_OIIO_INC = '${BF_OIIO}/include' BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a' BF_OIIO_LIBPATH = '${BF_OIIO}/lib' -WITH_BF_CYCLES_OSL = False +WITH_BF_CYCLES_OSL = True WITH_BF_STATICOSL = False BF_OSL = '/opt/lib/osl' BF_OSL_INC = '${BF_OSL}/include' @@ -130,7 +130,7 @@ BF_OSL_LIB = 'oslcomp oslexec oslquery' BF_OSL_LIBPATH = '${BF_OSL}/lib' BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' -WITH_BF_LLVM = False +WITH_BF_LLVM = True WITH_BF_STATICLLVM = False BF_LLVM = '/opt/lib/llvm-3.1' BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \ @@ -162,6 +162,4 @@ WITH_BF_OCEANSIM = True BF_DEBUG = False REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++ PLATFORM_LINKFLAGS = ['-lrt'] - -if WITH_BF_CYCLES_OSL: - BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive'] +BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive'] |