From 023f8b750150c5c5370cb7154cbeadbd3ed5ec6e Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 25 Sep 2004 17:09:24 +0000
Subject: [PATCH] Attempt to fix incorrect error non-reporting because the
 cwenv.bat from CW-9 incorrectly sets the ERRORLEVEL pseudo variable.

[SVN r25403]
---
 v1/cw-tools.jam | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/v1/cw-tools.jam b/v1/cw-tools.jam
index 3d9d34aab..e3507522a 100644
--- a/v1/cw-tools.jam
+++ b/v1/cw-tools.jam
@@ -200,7 +200,11 @@ if $(NT) && $(cw-version) in 6.0
 # The paths to system and runtime libraries
 if $(NT)
 {
-    flags cw CW_SETUP : "call \"$(cw-root)\\Other Metrowerks Tools\\Command Line Tools\\cwenv.bat\" -quiet" ;
+    # Having CW_SETUP split into two lines is intentional. It is
+    # the only way to get the CMD to correctly clear the values of ERRORLEVEL
+    # which is erronously set by the cwenv.bat from CW-9.
+    flags cw CW_SETUP : "call \"$(cw-root)\\Other Metrowerks Tools\\Command Line Tools\\cwenv.bat\" -quiet
+    set ERRORLEVEL=" ;
     flags cw CW_LINK_SETUP : "set MWWinx86LibraryFiles=" ;
     flags cw CW_IMPLIB_COMMAND : "-implib " ;
     flags cw CW_RUN_PATH :