[Bf-blender-cvs] [5bbef85bc8a] blender-v3.3-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:08:48 CET 2022


Commit: 5bbef85bc8a19e1ad4c0f12c4e81bebf0c6600a8
Author: Brecht Van Lommel
Date:   Thu Nov 17 14:00:31 2022 +0100
Branches: blender-v3.3-release
https://developer.blender.org/rB5bbef85bc8a19e1ad4c0f12c4e81bebf0c6600a8

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 bf140812ebb..5ba85c43b8e 100755
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -54,10 +54,11 @@ def svn_update(args, release_version):
 
     # 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