[Bf-blender-cvs] [c8b84a13a5f] master: Make deps: Disabled assembly for GMP on Apple/arm64.
Stefan Werner
noreply at git.blender.org
Thu Sep 3 10:12:34 CEST 2020
Commit: c8b84a13a5fa816aaba8cc3733f92e4fcaf938b4
Author: Stefan Werner
Date: Thu Sep 3 10:11:59 2020 +0200
Branches: master
https://developer.blender.org/rBc8b84a13a5fa816aaba8cc3733f92e4fcaf938b4
Make deps: Disabled assembly for GMP on Apple/arm64.
This appears to be a configuration for which GMP has no assembly,
yet the default configure script tries to build it.
===================================================================
M build_files/build_environment/cmake/gmp.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/gmp.cmake b/build_files/build_environment/cmake/gmp.cmake
index 40d8e04b3a7..16d2611ee12 100644
--- a/build_files/build_environment/cmake/gmp.cmake
+++ b/build_files/build_environment/cmake/gmp.cmake
@@ -25,6 +25,13 @@ else()
set(GMP_OPTIONS --enable-static --disable-shared )
endif()
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
+ set(GMP_OPTIONS
+ ${GMP_OPTIONS}
+ --disable-assembly
+ )
+endif()
+
ExternalProject_Add(external_gmp
URL ${GMP_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
More information about the Bf-blender-cvs
mailing list