summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-08-05 13:55:08 (GMT)
committerBrad King <brad.king@kitware.com>2008-08-05 13:55:08 (GMT)
commitd35b5a2fb1159dbdfea46961df522ccf21e3e373 (patch)
tree60b364a085ac37708ba16c7d35fd2eb829d1463e
parente44a9c92998a24baf80f75997cbcc651a10e34d2 (diff)
downloadCMake-d35b5a2fb1159dbdfea46961df522ccf21e3e373.zip
CMake-d35b5a2fb1159dbdfea46961df522ccf21e3e373.tar.gz
CMake-d35b5a2fb1159dbdfea46961df522ccf21e3e373.tar.bz2
BUG: Do not convert RPATH entries to full path.
When generating RPATH entries on the link line using a repeated linker flag (-R ... -R ... style) do not convert individual entries to a full path. We need to preserve what the user requested.
-rw-r--r--Source/cmLocalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d835bc4..79e64d7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1573,7 +1573,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::ostream& fout,
ri != runtimeDirs.end(); ++ri)
{
rpath += cli.GetRuntimeFlag();
- rpath += this->Convert(ri->c_str(), FULL, SHELL, false);
+ rpath += this->Convert(ri->c_str(), NONE, SHELL, false);
rpath += " ";
}
fout << rpath;