@@ -39,10 +39,6 @@ using namespace swift;
39
39
using namespace swift ::driver;
40
40
using namespace llvm ::opt;
41
41
42
- // / The path for Swift libraries in the OS. (Duplicated from Immediate.cpp.
43
- // / Eventually we should consolidate this.)
44
- #define OS_LIBRARY_PATH " /usr/lib/swift"
45
-
46
42
std::string
47
43
toolchains::Darwin::findProgramRelativeToSwiftImpl (StringRef name) const {
48
44
StringRef swiftPath = getDriver ().getSwiftProgramPath ();
@@ -76,15 +72,12 @@ toolchains::Darwin::constructInvocation(const InterpretJobAction &job,
76
72
const JobContext &context) const {
77
73
InvocationInfo II = ToolChain::constructInvocation (job, context);
78
74
79
- SmallString<128 > envValue (OS_LIBRARY_PATH " :" );
80
-
81
75
SmallString<128 > runtimeLibraryPath;
82
76
getRuntimeLibraryPath (runtimeLibraryPath, context.Args , /* Shared=*/ true );
83
- envValue.append (runtimeLibraryPath);
84
77
85
78
addPathEnvironmentVariableIfNeeded (II.ExtraEnvironment , " DYLD_LIBRARY_PATH" ,
86
79
" :" , options::OPT_L, context.Args ,
87
- envValue );
80
+ runtimeLibraryPath );
88
81
addPathEnvironmentVariableIfNeeded (II.ExtraEnvironment , " DYLD_FRAMEWORK_PATH" ,
89
82
" :" , options::OPT_F, context.Args );
90
83
// FIXME: Add options::OPT_Fsystem paths to DYLD_FRAMEWORK_PATH as well.
0 commit comments