diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-07-12 13:44:38 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-07-12 13:44:38 (GMT) |
| commit | 0416c94f6415101e93e9dc3f83d666926ee2da16 (patch) | |
| tree | 3bf49a6bd00fb0868f90c9c5ee520e0648102f49 /Source/cmComputeLinkInformation.cxx | |
| parent | 4dc515f8e16f0a924fb7f941c1cfe704dea9e785 (diff) | |
| download | CMake-0416c94f6415101e93e9dc3f83d666926ee2da16.zip CMake-0416c94f6415101e93e9dc3f83d666926ee2da16.tar.gz CMake-0416c94f6415101e93e9dc3f83d666926ee2da16.tar.bz2 | |
Revert "Use --sysroot when cross compiling."
This reverts commit de4da665d3205afa239749c41513a315c3831f51.
This feature is not yet ready for release. It needs to be
merged with the CMAKE_OSX_SYSROOT feature.
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 0ba0139..ab9eb14 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1884,8 +1884,6 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs, } if(use_build_rpath || use_link_rpath) { - std::string rootPath = this->Makefile->GetSafeDefinition("CMAKE_SYSROOT"); - cmSystemTools::ConvertToUnixSlashes(rootPath); std::vector<std::string> const& rdirs = this->GetRuntimeSearchPath(); for(std::vector<std::string>::const_iterator ri = rdirs.begin(); ri != rdirs.end(); ++ri) @@ -1909,14 +1907,9 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs, !cmSystemTools::IsSubDirectory(ri->c_str(), topSourceDir) && !cmSystemTools::IsSubDirectory(ri->c_str(), topBinaryDir)) { - std::string d = *ri; - if (d.find(rootPath) == 0) + if(emitted.insert(*ri).second) { - d = d.substr(rootPath.size()); - } - if(emitted.insert(d).second) - { - runtimeDirs.push_back(d); + runtimeDirs.push_back(*ri); } } } |