From f13a6a087e3f882b496ab34c12cc7777795a5c2f Mon Sep 17 00:00:00 2001
From: Peter Kuemmel <syntheticpp@gmx.net>
Date: Fri, 15 Jun 2012 01:43:08 +0200
Subject: Ninja: undo all the NOSHELL patches

---
 Source/cmLocalNinjaGenerator.cxx | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'Source/cmLocalNinjaGenerator.cxx')

diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 71f0913439..5d193cde41 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -264,14 +264,6 @@ void cmLocalNinjaGenerator::AppendCustomCommandDeps(const cmCustomCommand *cc,
   }
 }
 
-std::string cmLocalNinjaGenerator::nopCommand() const {
-#ifdef _WIN32
-    return "cd .";
-#else
-    return ":";
-#endif
-}
-
 std::string cmLocalNinjaGenerator::BuildCommandLine(
                                     const std::vector<std::string> &cmdLines)
 {
@@ -280,10 +272,9 @@ std::string cmLocalNinjaGenerator::BuildCommandLine(
   // don't use POST_BUILD.
   if (cmdLines.empty())
 #ifdef _WIN32
-    return "";
+    return "cd.";
 #else
-    // TODO use _NOSHELL rule also on Linux
-    return nopCommand();
+    return ":";
 #endif
 
   std::ostringstream cmd;
-- 
cgit v1.2.1