1 files changed, 10 insertions, 3 deletions
diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat b/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat
index fac89bd9ee..4b3edfe2d6 100644
--- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat
+++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat
@@ -1,6 +1,7 @@
 @REM ## @file
+@REM # Makefile
 @REM #
-@REM # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+@REM # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 @REM # This program and the accompanying materials
 @REM # are licensed and made available under the terms and conditions of the BSD License
 @REM # which accompanies this distribution.    The full text of the license may be found at
@@ -8,9 +9,10 @@
 @REM #
 @REM # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 @REM # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+@REM # 
 
 @echo off
+@set TOOL_ERROR=0
 setlocal
 SET NMAKE_COMMAND=%1
 SHIFT
@@ -21,7 +23,10 @@ if "%1"=="" goto success
 ECHO Building %1
 pushd %1
 nmake %NMAKE_COMMAND%
-if ERRORLEVEL 1 goto error
+if ERRORLEVEL 1 (
+  set /A TOOL_ERROR= %TOOL_ERROR% + %ERRORLEVEL%
+  goto error
+)
 ECHO %1 built successfully (%NMAKE_COMMAND%)
 ECHO.
 shift
@@ -33,8 +38,10 @@ goto exit
 
 :error
 popd
+set /A TOOL_ERROR=%TOOL_ERROR%+%ERRORLEVEL%
 ENDLOCAL
 ECHO Error while making %1!
 VERIFY OTHER 2>NUL
 
 :exit
+exit /B %TOOL_ERROR%