From a717e52f66a234cc49802147a6242e6342a90a81 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 13 Dec 2020 12:02:54 +0100
Subject: [PATCH] Don't use default macos/arm64 deployment target in
 calculating the platform tag for fat binaries (#390)

The system compiler in Xcode 12 will not set the deployment target for arm64 below 11.0.0
(which is the first version of macOS supporting arm64). To allow building wheels that target
an earlier version of macOS (by way of the x86_64 part of fat binaries) ignore the deployment
target in the arm64 part of fat binaries when that's 11.0.0.
---
 src/wheel/macosx_libfile.py                     |  14 ++++++++++++++
 tests/test_macosx_libfile.py                    |   1 +
 .../test_lib_10_9_universal2.dylib              | Bin 0 -> 65936 bytes
 3 files changed, 15 insertions(+)
 create mode 100755 tests/testdata/macosx_minimal_system_version/test_lib_10_9_universal2.dylib

diff --git a/src/wheel/macosx_libfile.py b/src/wheel/macosx_libfile.py
index f8ad3cab..8918039f 100644
--- a/src/wheel/macosx_libfile.py
+++ b/src/wheel/macosx_libfile.py
@@ -33,6 +33,9 @@
 - All structures signatures are taken form macosx header files.
 - I think that binary format will be more stable than `otool` output.
   and if apple introduce some changes both implementation will need to be updated.
+- The system compile will set the deployment target no lower than
+  11.0 for arm64 builds. For "Universal 2" builds use the x86_64 deployment
+  target when the arm64 target is 11.0.
 """
 
 import ctypes
@@ -53,6 +56,7 @@
 LC_VERSION_MIN_MACOSX = 0x24
 LC_BUILD_VERSION = 0x32
 
+CPU_TYPE_ARM64 = 0x0100000c
 
 mach_header_fields = [
         ("magic", ctypes.c_uint32), ("cputype", ctypes.c_int),
@@ -271,6 +275,16 @@ class FatArch(BaseClass):
                 try:
                     version = read_mach_header(lib_file, el.offset)
                     if version is not None:
+                        if el.cputype == CPU_TYPE_ARM64 and len(fat_arch_list) != 1:
+                            # Xcode will not set the deployment target below 11.0.0
+                            # for the arm64 architecture. Ignore the arm64 deployment
+                            # in fat binaries when the target is 11.0.0, that way
+                            # the other architetures can select a lower deployment
+                            # target.
+                            # This is safe because there is no arm64 variant for
+                            # macOS 10.15 or earlier.
+                            if version == (11, 0, 0):
+                                continue
                         versions_list.append(version)
                 except ValueError:
                     pass
diff --git a/tests/test_macosx_libfile.py b/tests/test_macosx_libfile.py
index 337f0e30..614e723c 100644
--- a/tests/test_macosx_libfile.py
+++ b/tests/test_macosx_libfile.py
@@ -23,6 +23,7 @@ def test_read_from_dylib():
         ("test_lib_multiple_fat.dylib", "10.14.0"),
         ("test_lib_10_10_10.dylib", "10.10.10"),
         ("test_lib_11.dylib", "11.0.0"),
+        ("test_lib_10_9_universal2.dylib", "10.9.0"),
     ]
     for file_name, ver in versions:
         extracted = extract_macosx_min_system_version(
diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_9_universal2.dylib b/tests/testdata/macosx_minimal_system_version/test_lib_10_9_universal2.dylib
new file mode 100755
index 0000000000000000000000000000000000000000..26ab109c9957ee2453ddd94a14a7db02bd3e8689
GIT binary patch
literal 65936
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
a=fp<`e(Q`ad4AfJZ8Zat?HBV_Fa8rZUx$7G

literal 0
HcmV?d00001