Merge pull request #1531 from lhames/issue-68785-release

lhames · web-flow · commit 46bd60c4934a · 2024-01-29T10:17:23.000-08:00
For scripts, use DYLD_FRAMEWORK/LIBRARY_PATH to find frameworks / runtimes.
diff --git a/Sources/SwiftDriver/Jobs/Toolchain+InterpreterSupport.swift b/Sources/SwiftDriver/Jobs/Toolchain+InterpreterSupport.swift
@@ -43,7 +43,8 @@ extension DarwinToolchain {
 
     addPathEnvironmentVariableIfNeeded("DYLD_FRAMEWORK_PATH", to: &envVars,
                                        currentEnv: env, option: .F,
-                                       parsedOptions: &parsedOptions)
+                                       parsedOptions: &parsedOptions,
+                                       extraPaths: ["/System/Library/Frameworks"])
 
     return envVars
   }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ extension DarwinToolchain {`
`43`	`43`
`44`	`44`	`addPathEnvironmentVariableIfNeeded("DYLD_FRAMEWORK_PATH", to: &envVars,`
`45`	`45`	`currentEnv: env, option: .F,`
`46`		`- parsedOptions: &parsedOptions)`
	`46`	`+ parsedOptions: &parsedOptions,`
	`47`	`+ extraPaths: ["/System/Library/Frameworks"])`
`47`	`48`
`48`	`49`	`return envVars`
`49`	`50`	`}`