From 0a7c551bf61310859e47ebcce95e176a96db76bb Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 21 Jun 2010 10:50:11 -0400
Subject: [PATCH] Preserve ENV{MAKEFLAGS} in CMake script mode

Commit 02f7cfbc (Need to remove the MAKEFLAGS when cmake starts,
2003-05-13) removed the MAKEFLAGS environment variable when CMake starts
to prevent try_compile() from inheriting "make -i".  This is unnecessary
in script mode (cmake -P).  Instead remove the variable only when
configuring a project.
---
 Source/cmake.cxx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f766d4732..c009db9b3 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -162,16 +162,6 @@ cmake::cmake()
     }
 #endif
 
-  // If MAKEFLAGS are given in the environment, remove the environment
-  // variable.  This will prevent try-compile from succeeding when it
-  // should fail (if "-i" is an option).  We cannot simply test
-  // whether "-i" is given and remove it because some make programs
-  // encode the MAKEFLAGS variable in a strange way.
-  if(getenv("MAKEFLAGS"))
-    {
-    cmSystemTools::PutEnv("MAKEFLAGS=");
-    }
-
   this->Verbose = false;
   this->InTryCompile = false;
   this->CacheManager = new cmCacheManager(this);
@@ -2231,6 +2221,16 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
       }
     }
 
+  // If MAKEFLAGS are given in the environment, remove the environment
+  // variable.  This will prevent try-compile from succeeding when it
+  // should fail (if "-i" is an option).  We cannot simply test
+  // whether "-i" is given and remove it because some make programs
+  // encode the MAKEFLAGS variable in a strange way.
+  if(getenv("MAKEFLAGS"))
+    {
+    cmSystemTools::PutEnv("MAKEFLAGS=");
+    }
+
   this->PreLoadCMakeFiles();
 
   std::string systemFile = this->GetHomeOutputDirectory();