Skip to content

Commit 9d6b213

Browse files
jrose-applejrose-apple
authored
[Driver] Bump the required Apple SDK versions to the 2019 OSs (#25479)
rdar://problem/50779459 (cherry picked from commit 6b87e97)
1 parent c95adcb commit 9d6b213

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

‎lib/Driver/Driver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,14 +1319,14 @@ static bool isSDKTooOld(StringRef sdkPath, llvm::VersionTuple minVersion,
13191319
/// the given target.
13201320
static bool isSDKTooOld(StringRef sdkPath, const llvm::Triple &target) {
13211321
if (target.isMacOSX()) {
1322-
return isSDKTooOld(sdkPath, llvm::VersionTuple(10, 14), "OSX");
1322+
return isSDKTooOld(sdkPath, llvm::VersionTuple(10, 15), "OSX");
13231323

13241324
} else if (target.isiOS()) {
13251325
// Includes both iOS and TVOS.
1326-
return isSDKTooOld(sdkPath, llvm::VersionTuple(12, 0), "Simulator", "OS");
1326+
return isSDKTooOld(sdkPath, llvm::VersionTuple(13, 0), "Simulator", "OS");
13271327

13281328
} else if (target.isWatchOS()) {
1329-
return isSDKTooOld(sdkPath, llvm::VersionTuple(5, 0), "Simulator", "OS");
1329+
return isSDKTooOld(sdkPath, llvm::VersionTuple(6, 0), "Simulator", "OS");
13301330

13311331
} else {
13321332
return false;

‎test/Driver/sdk-apple.swift

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,37 @@
3434
// RUN: %empty-directory(%t/MacOSX10.12.Internal.sdk) && not %swift_driver -sdk %t/MacOSX10.12.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
3535
// RUN: %empty-directory(%t/MacOSX10.13.sdk) && not %swift_driver -sdk %t/MacOSX10.13.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
3636
// RUN: %empty-directory(%t/MacOSX10.13.Internal.sdk) && not %swift_driver -sdk %t/MacOSX10.13.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
37-
// RUN: %empty-directory(%t/MacOSX10.14.sdk) && %swift_driver -sdk %t/MacOSX10.14.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
38-
// RUN: %empty-directory(%t/MacOSX10.14.Internal.sdk) && %swift_driver -sdk %t/MacOSX10.14.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
37+
// RUN: %empty-directory(%t/MacOSX10.14.sdk) && not %swift_driver -sdk %t/MacOSX10.14.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
38+
// RUN: %empty-directory(%t/MacOSX10.14.Internal.sdk) && not %swift_driver -sdk %t/MacOSX10.14.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
39+
// RUN: %empty-directory(%t/MacOSX10.15.sdk) && %swift_driver -sdk %t/MacOSX10.15.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
40+
// RUN: %empty-directory(%t/MacOSX10.15.Internal.sdk) && %swift_driver -sdk %t/MacOSX10.15.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
3941
// RUN: %empty-directory(%t/OSX50.sdk) && %swift_driver -sdk %t/OSX50.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
4042

41-
// RUN: not %swift_driver -sdk %t/MacOSX10.9.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
42-
// RUN: not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
43-
// RUN: not %swift_driver -sdk %t/MacOSX10.10.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
44-
// RUN: not %swift_driver -sdk %t/MacOSX10.10.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
45-
// RUN: not %swift_driver -sdk %t/MacOSX10.11.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
46-
// RUN: not %swift_driver -sdk %t/MacOSX10.11.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
47-
// RUN: not %swift_driver -sdk %t/MacOSX10.12.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
48-
// RUN: not %swift_driver -sdk %t/MacOSX10.12.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
49-
// RUN: not %swift_driver -sdk %t/MacOSX10.13.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
50-
// RUN: not %swift_driver -sdk %t/MacOSX10.13.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
51-
// RUN: %swift_driver -sdk %t/MacOSX10.14.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
52-
// RUN: %swift_driver -sdk %t/MacOSX10.14.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
53-
5443
// RUN: %empty-directory(%t/iPhoneOS7.0.sdk) && not %swift_driver -sdk %t/iPhoneOS7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
5544
// RUN: %empty-directory(%t/iPhoneOS7.0.Internal.sdk) && not %swift_driver -sdk %t/iPhoneOS7.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
5645
// RUN: %empty-directory(%t/iPhoneOS8.0.sdk) && not %swift_driver -sdk %t/iPhoneOS8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
5746
// RUN: %empty-directory(%t/iPhoneOS8.0.Internal.sdk) && not %swift_driver -sdk %t/iPhoneOS8.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
5847
// RUN: %empty-directory(%t/iPhoneOS9.0.sdk) && not %swift_driver -sdk %t/iPhoneOS9.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
5948
// RUN: %empty-directory(%t/iPhoneOS10.0.sdk) && not %swift_driver -sdk %t/iPhoneOS10.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
6049
// RUN: %empty-directory(%t/iPhoneOS11.0.sdk) && not %swift_driver -sdk %t/iPhoneOS11.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
61-
// RUN: %empty-directory(%t/iPhoneOS12.0.sdk) && %swift_driver -sdk %t/iPhoneOS12.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
50+
// RUN: %empty-directory(%t/iPhoneOS12.0.sdk) && not %swift_driver -sdk %t/iPhoneOS12.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
51+
// RUN: %empty-directory(%t/iPhoneOS13.0.sdk) && %swift_driver -sdk %t/iPhoneOS13.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
6252

6353
// RUN: %empty-directory(%t/tvOS8.0.sdk) && not %swift_driver -sdk %t/tvOS8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
6454
// RUN: %empty-directory(%t/tvOS8.0.Internal.sdk) && not %swift_driver -sdk %t/tvOS8.0.Internal.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
6555
// RUN: %empty-directory(%t/tvOS9.0.sdk) && not %swift_driver -sdk %t/tvOS9.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
6656
// RUN: %empty-directory(%t/tvOS10.0.sdk) && not %swift_driver -sdk %t/tvOS10.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
6757
// RUN: %empty-directory(%t/tvOS11.0.sdk) && not %swift_driver -sdk %t/tvOS11.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
68-
// RUN: %empty-directory(%t/tvOS12.0.sdk) && %swift_driver -sdk %t/tvOS12.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
58+
// RUN: %empty-directory(%t/tvOS12.0.sdk) && not %swift_driver -sdk %t/tvOS12.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
59+
// RUN: %empty-directory(%t/tvOS13.0.sdk) && %swift_driver -sdk %t/tvOS13.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
6960

7061
// RUN: %empty-directory(%t/watchOS1.0.sdk) && not %swift_driver -sdk %t/watchOS1.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
7162
// RUN: %empty-directory(%t/watchOS1.0.Internal.sdk) && not %swift_driver -sdk %t/watchOS1.0.Internal.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
7263
// RUN: %empty-directory(%t/watchOS2.0.sdk) && not %swift_driver -sdk %t/watchOS2.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
7364
// RUN: %empty-directory(%t/watchOS3.0.sdk) && not %swift_driver -sdk %t/watchOS3.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
7465
// RUN: %empty-directory(%t/watchOS4.0.sdk) && not %swift_driver -sdk %t/watchOS4.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
75-
// RUN: %empty-directory(%t/watchOS5.0.sdk) && %swift_driver -sdk %t/watchOS5.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
66+
// RUN: %empty-directory(%t/watchOS5.0.sdk) && not %swift_driver -sdk %t/watchOS5.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
67+
// RUN: %empty-directory(%t/watchOS6.0.sdk) && %swift_driver -sdk %t/watchOS6.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
7668

7769
// RUN: %empty-directory(%t/iPhoneSimulator7.0.sdk) && not %swift_driver -sdk %t/iPhoneSimulator7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
7870
// RUN: %empty-directory(%t/iPhoneSimulator8.0.sdk) && not %swift_driver -sdk %t/iPhoneSimulator8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s

0 commit comments

Comments
 (0)