Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2020-02-08 23:01:31 +0300
committerRay Molenkamp <github@lazydodo.com>2020-02-08 23:01:31 +0300
commitb9c9b001710ab60b448e92550e04aaae48f39452 (patch)
tree5365af31146b71eea40ba56686f636910905074c /build_files/build_environment/cmake/llvm.cmake
parenta7106883e8dff40ed4bf5cef6f69ce612abf3880 (diff)
Build_environment: OSL 1.10.9 / llvm 9.0.1
OSL 1.10.9 fixes osl-bug 866 [1] which is long standing issue on windows where paths get un-escaped and osl breaks when you install it to for instance c:\blender-tests\new-boolean This patch bumps osl to 1.10.9, and since osl is llvm's only consumer, llvm/clang were bumped 9.0.1 Removed some of the patches that were no longer needed Builds and passes all tests on windows and linux [1] https://github.com/imageworks/OpenShadingLanguage/issues/866 Differential Revision: https://developer.blender.org/D6744 Reviewers: brecht
Diffstat (limited to 'build_files/build_environment/cmake/llvm.cmake')
-rw-r--r--build_files/build_environment/cmake/llvm.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/llvm.cmake b/build_files/build_environment/cmake/llvm.cmake
index dc1a5cf8a80..3ef0445201f 100644
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -23,6 +23,8 @@ set(LLVM_EXTRA_ARGS
-DLLVM_TARGETS_TO_BUILD=X86
-DLLVM_INCLUDE_EXAMPLES=OFF
-DLLVM_ENABLE_TERMINFO=OFF
+ -DLLVM_BUILD_LLVM_C_DYLIB=OFF
+ -DLLVM_ENABLE_UNWIND_TABLES=OFF
)
if(WIN32)