diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-13 15:40:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-13 15:40:38 (GMT) |
| commit | 5b85a3e26c5426dd563787a3460d53e6e751de28 (patch) | |
| tree | 410127101c938d7fa3af87f3585b5048654ed530 /Source | |
| parent | 8a56e311ec244a5e9c44457de0cb90643958e0ad (diff) | |
| parent | 9370b697e994e3b85549f07cbd54223e3e5d714f (diff) | |
| download | CMake-5b85a3e26c5426dd563787a3460d53e6e751de28.zip CMake-5b85a3e26c5426dd563787a3460d53e6e751de28.tar.gz CMake-5b85a3e26c5426dd563787a3460d53e6e751de28.tar.bz2 | |
Merge topic 'link-generated-rpaths-first'
9370b697 Re-order link line to place RPATH entries before libraries
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 694a9f6..c0ecba3 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1531,9 +1531,6 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries, linkLibs += " "; } - // Write the library flags to the build rule. - fout << linkLibs; - // Check what kind of rpath flags to use. if (cli.GetRuntimeSep().empty()) { // 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. std::string rpath_link = cli.GetRPathLinkString(); if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) { |