Skip to content

Commit 5566ace

Browse files
committed
[Apple Silicon] Adjust linking deployment target from 11.0 down to 10.16 on x86.
1 parent 0360f68 commit 5566ace

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

lib/Driver/DarwinToolChains.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,14 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
618618
micro = 0;
619619
}
620620

621+
// Temporary hack: adjust macOS version passed to the linker from
622+
// 11 down to 10.16, but only for x86.
623+
if (triple.isX86() && major == 11) {
624+
major = 10;
625+
minor = 16;
626+
micro = 0;
627+
}
628+
621629
break;
622630
case DarwinPlatformKind::IPhoneOS:
623631
case DarwinPlatformKind::IPhoneOSSimulator:

test/Driver/linker.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,18 @@
109109
// Check arm64 macOS first deployment version adjustment.
110110
// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-macosx10.15.1 %s 2>&1 | %FileCheck -check-prefix ARM64E_MACOS_LINKER %s
111111

112+
// Check x86 macOS 11 deployment version adjustment.
113+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx11.0 %s 2>&1 | %FileCheck -check-prefix X86_MACOS11_LINKER %s
114+
// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-macosx11.0 %s 2>&1 | %FileCheck -check-prefix ARM64E_MACOS_LINKER %s
115+
112116
// MACOS_10_15: -platform_version macos 10.9.0 10.15.0
113117
// MACOS_10_15_4: -platform_version macos 10.9.0 10.15.4
114118
// MACOS_UNVERSIONED: -platform_version macos 10.9.0 0.0.0
115119

120+
// ARM64E_MACOS_LINKER: -platform_version macos 11.0.0
121+
// X86_MACOS11_LINKER: -platform_version macos 10.16.0
122+
// X86_64_WATCHOS_SIM_LINKER: -platform_version watchos-simulator 7.0.0
123+
116124
// There are more RUN lines further down in the file.
117125

118126
// CHECK: swift

0 commit comments

Comments
 (0)