[Bf-blender-cvs] [27f277d9488] blender-v3.4-release: Fix T102577: make update issues with python x86_64 running on macOS Arm

Brecht Van Lommel noreply at git.blender.org
Thu Nov 17 14:07:22 CET 2022


Commit: 27f277d948881e1fcdd3e25c0c987fb5865617ee
Author: Brecht Van Lommel
Date:   Thu Nov 17 14:00:31 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB27f277d948881e1fcdd3e25c0c987fb5865617ee

Fix T102577: make update issues with python x86_64 running on macOS Arm

Still default to arm64 libraries in that case.

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

M	build_files/utils/make_update.py

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

diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py
index a0b61b18e60..93820ee994a 100755
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -59,10 +59,11 @@ def svn_update(args: argparse.Namespace, release_version: Optional[str]) -> None
 
     # Checkout precompiled libraries
     if sys.platform == 'darwin':
-        if platform.machine() == 'x86_64':
-            lib_platform = "darwin"
-        elif platform.machine() == 'arm64':
+        # Check platform.version to detect arm64 with x86_64 python binary.
+        if platform.machine() == 'arm64' or ('ARM64' in platform.version()):
             lib_platform = "darwin_arm64"
+        elif platform.machine() == 'x86_64':
+            lib_platform = "darwin"
         else:
             lib_platform = None
     elif sys.platform == 'win32':



More information about the Bf-blender-cvs mailing list