Fix macOS detection when running standalone

alisw · Oct 17, 2023 · 5585c71 · 5585c71
1 parent 30cec7e
commit 5585c71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/alibuild_helpers/utilities.py b/alibuild_helpers/utilities.py
@@ -134,10 +134,13 @@ def format(s, **kwds):
 def doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, platformProcessor):
   if platformSystem == "Darwin":
     import platform
-    if platform.machine() == "x86_64":
-      return "osx_x86-64"
-    else:
-      return "osx_arm64"
+    processor = platformProcessor
+    if not processor:
+      if platform.machine() == "x86_64":
+        processor = "x86-64"
+      else:
+        processor = "arm64"
+    return "osx_%s" % processor.replace("_", "-")
   distribution, version, flavour = platformTuple
   distribution = distribution.lower()
   # If platform.dist does not return something sensible,

diff --git a/tests/test_utilities.py b/tests/test_utilities.py
@@ -115,6 +115,7 @@
 
 architecturePayloads = [
   ['osx_x86-64', False, [], ('','',''), 'Darwin', 'x86-64'],
+  ['osx_arm64', False, [], ('','',''), 'Darwin', 'arm64'],
   ['slc5_x86-64', False, [], ('redhat', '5.XX', 'Boron'), 'Linux', 'x86-64'],
   ['slc6_x86-64', False, [], ('centos', '6.X', 'Carbon'), 'Linux', 'x86-64'],
   ['slc7_x86-64', False, [], ('centos', '7.X', 'Ptor'), 'Linux', 'x86-64'],