forked from bartvdbraak/blender
4fb0c83c1c
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
14 lines
640 B
Diff
14 lines
640 B
Diff
--- a/llvm/lib/Support/Unix/Path.inc 2020-02-17 09:24:26.000000000 +0100
|
|
+++ b/llvm/lib/Support/Unix/Path.inc 2020-02-17 09:26:25.000000000 +0100
|
|
@@ -1200,7 +1200,9 @@
|
|
/// implementation.
|
|
std::error_code copy_file(const Twine &From, const Twine &To) {
|
|
uint32_t Flag = COPYFILE_DATA;
|
|
-#if __has_builtin(__builtin_available) && defined(COPYFILE_CLONE)
|
|
+ // BLENDER: This optimization makes LLVM not build on older Xcode versions,
|
|
+ // just disable until everyone has new enough Xcode versions.
|
|
+#if 0
|
|
if (__builtin_available(macos 10.12, *)) {
|
|
bool IsSymlink;
|
|
if (std::error_code Error = is_symlink_file(From, IsSymlink))
|