diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2017-03-01 21:07:34 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2017-03-02 16:43:42 +0800 |
| commit | a11928f3310518ab1c6fd34e8d0fdbb72de9602c (patch) | |
| tree | 454a282221f7207cead5e48ae94c6a0782bc66d3 /BaseTools | |
| parent | 342fdb6eaa5934eacdf59158a99fb047fea797d6 (diff) | |
| download | edk2-a11928f3310518ab1c6fd34e8d0fdbb72de9602c.tar.gz edk2-a11928f3310518ab1c6fd34e8d0fdbb72de9602c.tar.bz2 edk2-a11928f3310518ab1c6fd34e8d0fdbb72de9602c.zip | |
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 <hao.a.wu@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/C/Makefiles/NmakeSubdirs.bat | 5 |
1 files changed, 2 insertions, 3 deletions
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.<BR>
+@REM # Copyright (c) 2007 - 2017, 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
@@ -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
|