Skip to content

Commit 2e73f37

Browse files
committed
Do not set DYLD_LIBRARY_PATH to point the installed toolchain/sdk.
This has not been a good idea since Swift started shipping in the OS. The OS runtime is the one we would like Swift scripts to use. Using the installed toolchain can potentially cause sync issues. Resolves rdar://78951185
1 parent 4586ec6 commit 2e73f37

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/SwiftDriver/Jobs/Toolchain+InterpreterSupport.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,9 @@ extension DarwinToolchain {
3838
targetInfo: FrontendTargetInfo) throws -> [String: String] {
3939
var envVars: [String: String] = [:]
4040

41-
let runtimePaths = try runtimeLibraryPaths(
42-
for: targetInfo,
43-
parsedOptions: &parsedOptions,
44-
sdkPath: sdkPath,
45-
isShared: true
46-
).map { $0.name }
47-
4841
addPathEnvironmentVariableIfNeeded("DYLD_LIBRARY_PATH", to: &envVars,
4942
currentEnv: env, option: .L,
50-
parsedOptions: &parsedOptions,
51-
extraPaths: runtimePaths)
43+
parsedOptions: &parsedOptions)
5244

5345
addPathEnvironmentVariableIfNeeded("DYLD_FRAMEWORK_PATH", to: &envVars,
5446
currentEnv: env, option: .F,

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,12 @@ final class SwiftDriverTests: XCTestCase {
23382338
}
23392339

23402340
XCTAssertFalse(job.commandLine.contains(.flag("--")))
2341+
// On darwin, swift ships in the OS. Immediate mode should use that runtime.
2342+
#if os(macOS)
2343+
XCTAssertFalse(job.extraEnvironment.keys.contains("\(driver.targetTriple.isDarwin ? "DYLD" : "LD")_LIBRARY_PATH"))
2344+
#else
23412345
XCTAssertTrue(job.extraEnvironment.keys.contains("\(driver.targetTriple.isDarwin ? "DYLD" : "LD")_LIBRARY_PATH"))
2346+
#endif
23422347
}
23432348

23442349
do {

0 commit comments

Comments
 (0)