diff options
author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-14 23:43:08 (GMT) |
---|---|---|
committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-14 23:43:08 (GMT) |
commit | f13a6a087e3f882b496ab34c12cc7777795a5c2f (patch) | |
tree | 066b0826fb9de8745052447f8ee1ef65d8262d3a /Source/cmGlobalNinjaGenerator.cxx | |
parent | 555bda4e436435c37690aa5f31f4d254793d5b4e (diff) | |
download | CMake-f13a6a087e3f882b496ab34c12cc7777795a5c2f.zip CMake-f13a6a087e3f882b496ab34c12cc7777795a5c2f.tar.gz CMake-f13a6a087e3f882b496ab34c12cc7777795a5c2f.tar.bz2 |
Ninja: undo all the NOSHELL patches
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
-rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index d8da5ed..3af58a9 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -106,7 +106,6 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os, const cmNinjaDeps& implicitDeps, const cmNinjaDeps& orderOnlyDeps, const cmNinjaVars& variables, - bool suppressShell, int cmdLineLimit) { // Make sure there is a rule. @@ -178,15 +177,8 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os, // check if a response file rule should be used const std::string args = arguments.str(); - if (suppressShell) - { - builds << "_NOSHELL"; - } - else if (cmdLineLimit > 0 && - args.size() + builds.str().size() > (size_t)cmdLineLimit) - { + if (cmdLineLimit > 0 && args.size() > (size_t)cmdLineLimit) builds << "_RSPFILE"; - } os << builds.str() << args; |