diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2021-02-24 17:13:37 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2021-02-24 17:13:37 +0300 |
| commit | 4fb0c83c1c8529b61d38d8a409caf58d05a53bd9 (patch) | |
| tree | 18ce99c74a8305a63f93b4ef57a5648818d3352c /source/creator | |
| parent | 5be72125bf4dfddf5dfe720caa12b3163f540faf (diff) | |
Cmake/deps: Update OSL to 1.11.10.0
This bumps OSL to 1.11.10.0. OSL Has a new build time
dependency: Clang, and more importantly it expects
clang and llvm to share a library folder, which it
previously for us did not.
This patch changes:
-OSL Update to 1.11.10.0
-refactor the llvm/clang/clang-tools-extra builds into the llvm
build using the llvm-project tarball for building that has all
of the subprojects in it.
-update ispc/openmp builds since clang no longer its own dependency
and they have to depend on the llvm build now.
-Update the windows builder to use the 64 bit host tools since it
ran out of ram linking clang
-Since OSL now needs clang to link successfully a findclang.cmake
has been provided for linux/OSX
Differential Revision: https://developer.blender.org/D10212
Reviewed By: brecht, sebbas, sybren
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/blender.map | 1 | ||||
| -rw-r--r-- | source/creator/osx_locals.map | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/creator/blender.map b/source/creator/blender.map index 5171e94382d..9aafddd9666 100644 --- a/source/creator/blender.map +++ b/source/creator/blender.map @@ -16,6 +16,7 @@ local: *boost*; *ceres*; *cineon*; + *clang*; *COLLADA*; cu*; *default_error_condition*; diff --git a/source/creator/osx_locals.map b/source/creator/osx_locals.map index 86cd32791dd..5619f151bd2 100644 --- a/source/creator/osx_locals.map +++ b/source/creator/osx_locals.map @@ -7,6 +7,7 @@ blosc* *boost* *ceres* *cineon* +*clang* *COLLADA* cu* decodeInstruction |