diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-07-28 21:00:21 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-07-28 21:00:21 +0400 |
| commit | 2c51978d2b61b7a8c4c3c14bf5a9a8d573a8120a (patch) | |
| tree | ccb36ab7dd0e366ec6029c29d2fc90cf04cf86a4 /build_files | |
| parent | c85265b4551acbc7adf41f47f612373e42e0176d (diff) | |
Switch buildbot to new llvm/oiio/osl
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-i686.py | 6 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-x86_64.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index 41d6a4a78dc..d7a1439e003 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -22,7 +22,7 @@ BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \ '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \ '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a ' + \ - '${BF_OPENCOLLADA}/lib/libUTF.a ${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \ + '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \ '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \ '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64' @@ -134,8 +134,8 @@ BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' 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 ' + \ +BF_LLVM = '/opt/lib/llvm-3.4.2' +BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \ 'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \ 'LLVMTarget LLVMMC LLVMCore LLVMSupport' BF_LLVM_LIBPATH = '${BF_LLVM}/lib' diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py index d94923cc39d..f07c447bf29 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -22,7 +22,7 @@ BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \ '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \ '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a ' + \ - '${BF_OPENCOLLADA}/lib/libUTF.a ${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \ + '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \ '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \ '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64' @@ -134,8 +134,8 @@ BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' 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 ' + \ +BF_LLVM = '/opt/lib/llvm-3.4.2' +BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \ 'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \ 'LLVMTarget LLVMMC LLVMCore LLVMSupport' BF_LLVM_LIBPATH = '${BF_LLVM}/lib' |