averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux runtime path generation.

Browse Source 
Swift SVN r24280
This commit is contained in:
Graham Batty
2015-01-08 20:55:16 +00:00
parent 05e020e54b
commit e451d93372
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Driver/Tools.cpp
View File

@@ -670,6 +670,8 @@ Job *linux::Linker::constructJob(const JobAction &JA,
llvm::sys::path::remove_filename(RuntimeLibPath); // remove /bin
llvm::sys::path::append(RuntimeLibPath, "lib", "swift");
}
llvm::sys::path::append(RuntimeLibPath,
getPlatformNameForTriple(TC.getTriple()));
Arguments.push_back("-L");
Arguments.push_back(Args.MakeArgString(RuntimeLibPath));
@@ -686,7 +688,7 @@ Job *linux::Linker::constructJob(const JobAction &JA,
Arguments.push_back("-Xlinker");
Arguments.push_back("-T");
Arguments.push_back(
Args.MakeArgString(Twine(RuntimeLibPath) + "/linux/x86_64/swift.ld"));
Args.MakeArgString(Twine(RuntimeLibPath) + "/x86_64/swift.ld"));
// This should be the last option, for convenience in checking output.
Arguments.push_back("-o");