Skip to content

Commit 82ceb29

Browse files
DougGregorDougGregor
committed
[Driver] Fix platform name to match what the linker does, not what it says
1 parent 970ff6b commit 82ceb29

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎lib/Driver/DarwinToolChains.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
525525
// Compute the name of the platform for the linker.
526526
const char *platformName;
527527
if (tripleIsMacCatalystEnvironment(triple)) {
528-
platformName = "mac catalyst";
528+
platformName = "mac-catalyst";
529529
} else {
530530
switch (getDarwinPlatformKind(triple)) {
531531
case DarwinPlatformKind::MacOS:
@@ -535,19 +535,19 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
535535
platformName = "ios";
536536
break;
537537
case DarwinPlatformKind::IPhoneOSSimulator:
538-
platformName = "ios-sim";
538+
platformName = "ios-simulator";
539539
break;
540540
case DarwinPlatformKind::TvOS:
541541
platformName = "tvos";
542542
break;
543543
case DarwinPlatformKind::TvOSSimulator:
544-
platformName = "tvos-sim";
544+
platformName = "tvos-simulator";
545545
break;
546546
case DarwinPlatformKind::WatchOS:
547547
platformName = "watchos";
548548
break;
549549
case DarwinPlatformKind::WatchOSSimulator:
550-
platformName = "watchos-sim";
550+
platformName = "watchos-simulator";
551551
break;
552552
}
553553
}

‎test/Driver/linker.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
// IOS_SIMPLE-DAG: -L {{[^ ]+(/|\\\\)lib(/|\\\\)swift(/|\\\\)iphonesimulator}}
143143
// IOS_SIMPLE-DAG: -lSystem
144144
// IOS_SIMPLE-DAG: -arch x86_64
145-
// IOS_SIMPLE-DAG: -platform_version ios-sim 7.1.{{[0-9]+}} 0.0.0
145+
// IOS_SIMPLE-DAG: -platform_version ios-simulator 7.1.{{[0-9]+}} 0.0.0
146146
// IOS_SIMPLE: -o linker
147147

148148

@@ -154,7 +154,7 @@
154154
// tvOS_SIMPLE-DAG: -L {{[^ ]+(/|\\\\)lib(/|\\\\)swift(/|\\\\)appletvsimulator}}
155155
// tvOS_SIMPLE-DAG: -lSystem
156156
// tvOS_SIMPLE-DAG: -arch x86_64
157-
// tvOS_SIMPLE-DAG: -platform_version tvos-sim 9.0.{{[0-9]+}} 0.0.0
157+
// tvOS_SIMPLE-DAG: -platform_version tvos-simulator 9.0.{{[0-9]+}} 0.0.0
158158
// tvOS_SIMPLE: -o linker
159159

160160

@@ -166,7 +166,7 @@
166166
// watchOS_SIMPLE-DAG: -L {{[^ ]+(/|\\\\)lib(/|\\\\)swift(/|\\\\)watchsimulator}}
167167
// watchOS_SIMPLE-DAG: -lSystem
168168
// watchOS_SIMPLE-DAG: -arch i386
169-
// watchOS_SIMPLE-DAG: -platform_version watchos-sim 2.0.{{[0-9]+}} 0.0.0
169+
// watchOS_SIMPLE-DAG: -platform_version watchos-simulator 2.0.{{[0-9]+}} 0.0.0
170170
// watchOS_SIMPLE: -o linker
171171

172172

‎test/Driver/macabi-environment.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// IOS13-MACABI-DAG: -rpath [[MACOSX_STDLIB_PATH]]
1616
// IOS13-MACABI-DAG: -rpath [[MACCATALYST_SDK_STDLIB_PATH]]
1717
// IOS13-MACABI-DAG: -rpath [[MACOSX_SDK_STDLIB_PATH]]
18-
// IOS13-MACABI-DAG: -platform_version "mac catalyst" 13.0.0 0.0.0
18+
// IOS13-MACABI-DAG: -platform_version mac-catalyst 13.0.0 0.0.0
1919

2020
// Adjust iOS versions < 13.0 to 13.0 for the linker's sake.
2121

@@ -32,7 +32,7 @@
3232
// IOS12-MACABI-DAG: -rpath [[MACOSX_STDLIB_PATH]]
3333
// IOS12-MACABI-DAG: -rpath [[MACCATALYST_SDK_STDLIB_PATH]]
3434
// IOS12-MACABI-DAG: -rpath [[MACOSX_SDK_STDLIB_PATH]]
35-
// IOS12-MACABI-DAG: -platform_version "mac catalyst" 13.0.0 0.0.0
35+
// IOS12-MACABI-DAG: -platform_version mac-catalyst 13.0.0 0.0.0
3636

3737
// Test using target-variant to build zippered outputs
3838

@@ -45,7 +45,7 @@
4545
// ZIPPERED-VARIANT-LIBRARY: -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi
4646

4747
// ZIPPERED-VARIANT-LIBRARY: bin/ld
48-
// ZIPPERED-VARIANT-LIBRARY: -platform_version macos 10.14.0 0.0.0 -platform_version "mac catalyst" 13.0.0 0.0.0
48+
// ZIPPERED-VARIANT-LIBRARY: -platform_version macos 10.14.0 0.0.0 -platform_version mac-catalyst 13.0.0 0.0.0
4949

5050
// Make sure we pass the -target-variant when creating the pre-compiled header.
5151
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -enable-bridging-pch -import-objc-header %S/Inputs/bridging-header.h %s | %FileCheck -check-prefix=ZIPPERED-VARIANT-PCH %s
@@ -55,7 +55,7 @@
5555
// ZIPPERED-VARIANT-PCH: bin/swift
5656
// ZIPPERED-VARIANT-PCH: -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi
5757
// ZIPPERED-VARIANT-PCH: bin/ld
58-
// ZIPPERED-VARIANT-PCH: -platform_version macos 10.14.0 0.0.0 -platform_version "mac catalyst" 13.0.0 0.0.0
58+
// ZIPPERED-VARIANT-PCH: -platform_version macos 10.14.0 0.0.0 -platform_version mac-catalyst 13.0.0 0.0.0
5959

6060
// Test using 'reverse' target-variant to build zippered outputs when the primary
6161
// target is ios-macabi
@@ -69,7 +69,7 @@
6969
// REVERSE-ZIPPERED-VARIANT-LIBRARY: -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14
7070

7171
// REVERSE-ZIPPERED-VARIANT-LIBRARY: bin/ld
72-
// REVERSE-ZIPPERED-VARIANT-LIBRARY: -platform_version "mac catalyst" 13.0.0 0.0.0 -platform_version macos 10.14.0
72+
// REVERSE-ZIPPERED-VARIANT-LIBRARY: -platform_version mac-catalyst 13.0.0 0.0.0 -platform_version macos 10.14.0
7373

7474
// Make sure we pass the -target-variant when creating the pre-compiled header.
7575
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14 -enable-bridging-pch -import-objc-header %S/Inputs/bridging-header.h %s | %FileCheck -check-prefix=REVERSE-ZIPPERED-VARIANT-PCH %s
@@ -79,7 +79,7 @@
7979
// REVERSE-ZIPPERED-VARIANT-PCH: bin/swift
8080
// REVERSE-ZIPPERED-VARIANT-PCH: -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14
8181
// REVERSE-ZIPPERED-VARIANT-PCH: bin/ld
82-
// REVERSE-ZIPPERED-VARIANT-PCH: -platform_version "mac catalyst" 13.0.0 0.0.0 -platform_version macos 10.14.0 0.0.0
82+
// REVERSE-ZIPPERED-VARIANT-PCH: -platform_version mac-catalyst 13.0.0 0.0.0 -platform_version macos 10.14.0 0.0.0
8383

8484
// RUN: not %swiftc_driver -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0 %s 2>&1 | %FileCheck --check-prefix=UNSUPPORTED-TARGET-VARIANT %s
8585
// RUN: not %swiftc_driver -target x86_64-apple-ios13.0 -target-variant x86_64-apple-macosx10.14 %s 2>&1 | %FileCheck --check-prefix=UNSUPPORTED-TARGET %s
@@ -89,7 +89,7 @@
8989

9090
// When compiling for iOS, pass iphoneos_version_min to the linker, not maccatalyst_version_min.
9191

92-
// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-ios13.0 -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS13-NO-MACABI -implicit-check-not="mac catalyst" %s
92+
// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-ios13.0 -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS13-NO-MACABI -implicit-check-not=mac-catalyst %s
9393
// IOS13-NO-MACABI: bin/swift
9494
// IOS13-NO-MACABI: -target arm64-apple-ios13.0
9595

@@ -103,13 +103,13 @@
103103

104104
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_ZIPPERED %s
105105
// MACOS_10_15_ZIPPERED: -platform_version macos 10.14.0 10.15.0
106-
// MACOS_10_15_ZIPPERED: -platform_version "mac catalyst" 13.0.0 13.1.0
106+
// MACOS_10_15_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.1.0
107107

108108
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_ZIPPERED %s
109109
// MACOS_10_15_4_ZIPPERED: -platform_version macos 10.14.0 10.15.4
110-
// MACOS_10_15_4_ZIPPERED: -platform_version "mac catalyst" 13.0.0 13.4.0
110+
// MACOS_10_15_4_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.4.0
111111

112112
// RUN: %swiftc_driver -driver-print-jobs -target-variant x86_64-apple-macosx10.14 -target x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_REVERSE_ZIPPERED %s
113-
// MACOS_10_15_4_REVERSE_ZIPPERED: -platform_version "mac catalyst" 13.0.0 13.4.0
113+
// MACOS_10_15_4_REVERSE_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.4.0
114114
// MACOS_10_15_4_REVERSE_ZIPPERED: -platform_version macos 10.14.0 10.15.4
115115

0 commit comments

Comments
 (0)