From 8d69bf6ae475ee668284f22f22224db180d3507d Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Thu, 18 Jan 2024 23:11:04 -0800 Subject: [PATCH] For scripts, use DYLD_FRAMEWORK/LIBRARY_PATH to find frameworks / runtimes. Add DYLD_FRAMEWORK_PATH=/System/Library/Frameworks to the environment when constructing swift-frontend invocations for the interpreter so that dlopen can find autolinked frameworks. Resolves #68785. --- Sources/SwiftDriver/Jobs/Toolchain+InterpreterSupport.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/SwiftDriver/Jobs/Toolchain+InterpreterSupport.swift b/Sources/SwiftDriver/Jobs/Toolchain+InterpreterSupport.swift index ede3ebc5e..705d28f47 100644 --- 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 }