From 68178495c5ef4e125a9cf30b24e82a554269fee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Laferri=C3=A8re?= Date: Mon, 29 Aug 2022 09:50:13 -0700 Subject: [PATCH] Pass down SDK name to the compiler by default The compiler uses the -target-sdk-name flag information to restrict which swiftmodules can be loaded and which should be ignored. This prevents preventable crash when swiftmodules are copied between mismatching SDKs. rdar://83104265 --- Sources/SwiftDriver/Toolchains/DarwinToolchain.swift | 3 +-- Tests/SwiftDriverTests/SwiftDriverTests.swift | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift index eb3067480..e55a5a491 100644 --- a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift +++ b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift @@ -377,8 +377,7 @@ public final class DarwinToolchain: Toolchain { commandLine.append(.flag(sdkInfo.sdkVersion(for: targetVariantTriple).sdkVersionString)) } - if driver.isFrontendArgSupported(.targetSdkName) && - env["ENABLE_RESTRICT_SWIFTMODULE_SDK"] != nil { + if driver.isFrontendArgSupported(.targetSdkName) { commandLine.append(.flag(Option.targetSdkName.spelling)) commandLine.append(.flag(sdkInfo.canonicalName)) } diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift index 961ecaaa3..d49e67be9 100644 --- a/Tests/SwiftDriverTests/SwiftDriverTests.swift +++ b/Tests/SwiftDriverTests/SwiftDriverTests.swift @@ -3931,7 +3931,6 @@ final class SwiftDriverTests: XCTestCase { // Test cases ported from Driver/macabi-environment.swift func testDarwinSDKVersioning() throws { var envVars = ProcessEnv.vars - envVars["ENABLE_RESTRICT_SWIFTMODULE_SDK"] = "YES" envVars["SWIFT_DRIVER_LD_EXEC"] = ld.nativePathString(escaped: false) try withTemporaryDirectory { tmpDir in