Fix architecture detection when running on native ARM64 windows (#14667)

conan-io · Sep 5, 2023 · b9b65ac · b9b65ac
1 parent 21029be
commit b9b65ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/conans/client/conf/detect.py b/conans/client/conf/detect.py
@@ -331,6 +331,8 @@ def _detected_architecture():
         return "sparc"
     elif "aarch64" in machine:
         return "armv8"
+    elif "ARM64" in machine:
+        return "armv8"
     elif "arm64" in machine:
         return "armv8"
     elif "64" in machine:

diff --git a/conans/test/unittests/util/detected_architecture_test.py b/conans/test/unittests/util/detected_architecture_test.py
@@ -31,7 +31,9 @@ class DetectedArchitectureTest(unittest.TestCase):
         ['sparc64', 'sparcv9'],
         ['s390', 's390'],
         ['s390x', 's390x'],
-        ['arm64', "armv8"]
+        ['arm64', "armv8"],
+        ['aarch64', 'armv8'],
+        ['ARM64', 'armv8']
     ])
     def test_various(self, mocked_machine, expected_arch):