Commit: 8d2f4ddb2fc0af60bb46ccd6130416a0b10a29e4
Author: Brecht Van Lommel
Date: Mon Jan 9 14:28:25 2023 +0100
Branches: master
https://developer.blender.org/rB8d2f4ddb2fc0af60bb46ccd6130416a0b10a29e4
Fix T103423: boolean crash on macOS Apple silicon
Thanks to Howard Trickey for finding the cause.
===================================================================
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 820da4bdf7d..ffab5ed00e5 100644
--- a/build_files/build_environment/cmake/gmp.cmake
+++ b/build_files/build_environment/cmake/gmp.cmake
@@ -22,6 +22,14 @@ elseif(UNIX AND NOT APPLE)
)
endif()
+# Boolean crashes with Arm assembly, see T103423.
+if(BLENDER_PLATFORM_ARM)
+ set(GMP_OPTIONS
+ ${GMP_OPTIONS}
+ --disable-assembly
+ )
+endif()
+
ExternalProject_Add(external_gmp
URL file://${PACKAGE_DIR}/${GMP_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
