summaryrefslogtreecommitdiffstats
path: root/Source/cmNinjaNormalTargetGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-07-12 13:44:38 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-07-12 13:44:38 (GMT)
commit0416c94f6415101e93e9dc3f83d666926ee2da16 (patch)
tree3bf49a6bd00fb0868f90c9c5ee520e0648102f49 /Source/cmNinjaNormalTargetGenerator.cxx
parent4dc515f8e16f0a924fb7f941c1cfe704dea9e785 (diff)
downloadCMake-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/cmNinjaNormalTargetGenerator.cxx')
-rw-r--r--Source/cmNinjaNormalTargetGenerator.cxx22
1 files changed, 1 insertions, 21 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 921ca92..fa7e396 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -224,27 +224,7 @@ cmNinjaNormalTargetGenerator
vars.TargetVersionMajor = targetVersionMajor.c_str();
vars.TargetVersionMinor = targetVersionMinor.c_str();
-
- std::string flags = "$FLAGS";
-
- if (const char *rootPath =
- this->GetMakefile()->GetSafeDefinition("CMAKE_SYSROOT"))
- {
- if (*rootPath)
- {
- if (const char *sysrootFlag =
- this->GetMakefile()->GetDefinition("CMAKE_SYSROOT_FLAG"))
- {
- flags += " ";
- flags += sysrootFlag;
- flags += this->GetLocalGenerator()->EscapeForShell(rootPath);
- flags += " ";
- }
- }
- }
-
- vars.Flags = flags.c_str();
-
+ vars.Flags = "$FLAGS";
vars.LinkFlags = "$LINK_FLAGS";
std::string langFlags;