Skip to content

Pass down SDK name to the compiler by default #1164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2022
Merged

Pass down SDK name to the compiler by default #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Sources/SwiftDriver/Toolchains/DarwinToolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
1 change: 0 additions & 1 deletion Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down