[Bf-blender-cvs] [bd7bffd5369] mac_arm64: macOS: llvm builds now targets ARM on arm64 builds.

Stefan Werner noreply at git.blender.org
Mon Jul 13 08:39:21 CEST 2020


Commit: bd7bffd53698c7d9ed94d44a0be9f30bf2551e11
Author: Stefan Werner
Date:   Sat Jul 11 22:54:39 2020 +0200
Branches: mac_arm64
https://developer.blender.org/rBbd7bffd53698c7d9ed94d44a0be9f30bf2551e11

macOS: llvm builds now targets ARM on arm64 builds.

===================================================================

M	build_files/build_environment/cmake/llvm.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/llvm.cmake b/build_files/build_environment/cmake/llvm.cmake
index 981db9c72b7..b2b4ae1a117 100644
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -16,11 +16,17 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+if(APPLE AND "${OSX_ARCHITECTURES}" STREQUAL "arm64")
+  set(LLVM_TARGETS ARM)
+else()
+  set(LLVM_TARGETS X86)
+endif()
+
 set(LLVM_EXTRA_ARGS
   -DLLVM_USE_CRT_RELEASE=MD
   -DLLVM_USE_CRT_DEBUG=MDd
   -DLLVM_INCLUDE_TESTS=OFF
-  -DLLVM_TARGETS_TO_BUILD=X86
+  -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS}
   -DLLVM_INCLUDE_EXAMPLES=OFF
   -DLLVM_ENABLE_TERMINFO=OFF
   -DLLVM_BUILD_LLVM_C_DYLIB=OFF



More information about the Bf-blender-cvs mailing list