From a11928f3310518ab1c6fd34e8d0fdbb72de9602c Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Wed, 1 Mar 2017 21:07:34 +0800 Subject: BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0 In batch script file NmakeSubdirs.bat, the value changes made to the variable 'TOOL_ERROR' within the 'setlocal...endlocal' block will not be reflected in the return value of the script. A value of 0 will always be returned. Thus, the script will not reflect the result of the 'nmake' command correctly when building BaseTool source codes. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Yonghong Zhu --- BaseTools/Source/C/Makefiles/NmakeSubdirs.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'BaseTools/Source/C/Makefiles/NmakeSubdirs.bat') diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat b/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat index 4b3edfe2d6..816d4fa54f 100644 --- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat +++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat @@ -1,7 +1,7 @@ @REM ## @file @REM # Makefile @REM # -@REM # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+@REM # Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
@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 @@ -12,8 +12,8 @@ @REM # @echo off -@set TOOL_ERROR=0 setlocal +set TOOL_ERROR=0 SET NMAKE_COMMAND=%1 SHIFT @@ -39,7 +39,6 @@ goto exit :error popd set /A TOOL_ERROR=%TOOL_ERROR%+%ERRORLEVEL% -ENDLOCAL ECHO Error while making %1! VERIFY OTHER 2>NUL -- cgit v1.2.3