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/cmMakefileLibraryTargetGenerator.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/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 36d1a5a..347f26d 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -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)) |