kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'link-generated-rpaths-first' 

9370b697 Re-order link line to place RPATH entries before libraries
This commit is contained in:
Brad King 2016-09-13 11:40:38 -04:00 committed by CMake Topic Stage
parent 8a56e311ec 9370b697e9
commit 5b85a3e26c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@ -1531,9 +1531,6 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
linkLibs += " "; linkLibs += " ";
} }
// Write the library flags to the build rule.
fout << linkLibs;
// Check what kind of rpath flags to use. // Check what kind of rpath flags to use.
if (cli.GetRuntimeSep().empty()) { if (cli.GetRuntimeSep().empty()) {
// Each rpath entry gets its own option ("-R a -R b -R c") // Each rpath entry gets its own option ("-R a -R b -R c")
@ -1560,6 +1557,9 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
} }
} }
// Write the library flags to the build rule.
fout << linkLibs;
// Add the linker runtime search path if any. // Add the linker runtime search path if any.
std::string rpath_link = cli.GetRPathLinkString(); std::string rpath_link = cli.GetRPathLinkString();
if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) { if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) {