From 91a822749a6664dcaf0f67a837dcf0cd05783d17 Mon Sep 17 00:00:00 2001 From: wilson_chen Date: Fri, 26 Jul 2024 17:31:46 +0800 Subject: BaseTools: fix build error with TOOL_CHAIN_TAG VS2015 & VS2015x86 Start the build with TOOL_CHAIN_TAG VS2015 by launch: Build -t VS2015 ERROR: Would get following build error message: 'c:\Program' is not recognized as an internal or external command, operable program or batch file. NMAKE : fatal error U1077: '"c:\Program Files\Windows Kits\8.1\bin\x86\\rc.exe' : return code '0x1' Stop. Fix the build error, Tested : TOOL_CHAIN_TAG = VS2015 (>Build -t VS2015) TOOL_CHAIN_TAG = VS2015x86 (>Build -t VS2015x86) Signed-off-by: wilson_chen --- BaseTools/set_vsprefix_envs.bat | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'BaseTools/set_vsprefix_envs.bat') diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat index 39e4e004b5..df2c771951 100644 --- a/BaseTools/set_vsprefix_envs.bat +++ b/BaseTools/set_vsprefix_envs.bat @@ -35,10 +35,18 @@ if defined VS140COMNTOOLS ( set "VS2015_PREFIX=%VS140COMNTOOLS:~0,-14%" ) if not defined WINSDK81_PREFIX ( - set "WINSDK81_PREFIX=c:\Program Files\Windows Kits\8.1\bin\" + if exist "%ProgramFiles%\Windows Kits\8.1\bin" ( + set "WINSDK81_PREFIX=%ProgramFiles%\Windows Kits\8.1\bin\" + ) else if exist "%ProgramFiles(x86)%\Windows Kits\8.1\bin" ( + set "WINSDK81_PREFIX=%ProgramFiles(x86)%\Windows Kits\8.1\bin\" + ) ) if not defined WINSDK81x86_PREFIX ( - set "WINSDK81x86_PREFIX=c:\Program Files (x86)\Windows Kits\8.1\bin\" + if exist "%ProgramFiles(x86)%\Windows Kits\8.1\bin" ( + set "WINSDK81x86_PREFIX=%ProgramFiles(x86)%\Windows Kits\8.1\bin\" + ) else if exist "%ProgramFiles%\Windows Kits\8.1\bin" ( + set "WINSDK81x86_PREFIX=%ProgramFiles%\Windows Kits\8.1\bin\" + ) ) ) else ( if /I "%1"=="VS2015" goto ToolNotInstall -- cgit v1.2.3