mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 13:50:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use --sysroot when cross compiling."

Browse Source 
This reverts commit de4da665d3.

This feature is not yet ready for release. It needs to be
merged with the CMAKE_OSX_SYSROOT feature.
This commit is contained in:
Stephen Kelly
2013-07-12 15:44:38 +02:00
parent 4dc515f8e1
commit 0416c94f64
10 changed files with 9 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefileLibraryTargetGenerator.cxx
-20
View File
@@ -589,26 +589,6 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
cmLocalGenerator::SHELL);
vars.ObjectDir = objdir.c_str();
vars.Target = targetOutPathReal.c_str();
if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
{
if (const char *rootPath =
this->Makefile->GetSafeDefinition("CMAKE_SYSROOT"))
{
if (*rootPath)
{
if (const char *sysrootFlag =
this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
{
linkFlags += " ";
linkFlags += sysrootFlag;
linkFlags += this->LocalGenerator->EscapeForShell(rootPath);
linkFlags += " ";
}
}
}
}
vars.LinkLibraries = linkLibs.c_str();
vars.ObjectsQuoted = buildObjs.c_str();
if (this->Target->HasSOName(this->ConfigName))