summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate DeSimone <nathaniel.l.desimone@intel.com>2025-07-08 16:47:08 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2025-07-10 00:45:13 +0000
commit7c2e2d4f1a6fec4caeadc8295f1a7a21364e07ec (patch)
treee3c58d5587107a8c47e87a9f584646a71132a16b
parente2a30df32e523ec19abd980f9665dee4ab620917 (diff)
downloadedk2-7c2e2d4f1a6fec4caeadc8295f1a7a21364e07ec.zip
edk2-7c2e2d4f1a6fec4caeadc8295f1a7a21364e07ec.tar.gz
edk2-7c2e2d4f1a6fec4caeadc8295f1a7a21364e07ec.tar.bz2
BaseTools/toolsetup.bat: Set IASL_PREFIX when using Mingw-w64 on Windows
If IASL_PREFIX is not already defined, then edksetup.bat should set it. This unifies the behavior between Visual Studio and Mingw-w64. Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-rw-r--r--BaseTools/set_vsprefix_envs.bat7
-rwxr-xr-xBaseTools/toolsetup.bat11
2 files changed, 17 insertions, 1 deletions
diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat
index df2c771..5565f61 100644
--- a/BaseTools/set_vsprefix_envs.bat
+++ b/BaseTools/set_vsprefix_envs.bat
@@ -242,7 +242,12 @@ if not defined WINDDK3790_PREFIX (
)
if not defined IASL_PREFIX (
- set IASL_PREFIX=C:\ASL\
+ if exist "C:\ASL\" (
+ set IASL_PREFIX=C:\ASL\
+ ) else (
+ @echo.
+ @echo !!! WARNING !!! IASL_PREFIX environment variable is not set
+ )
)
popd
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index ac52f7a..92eb682 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -333,6 +333,17 @@ if defined VS2022 (
call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat
call %EDK_TOOLS_PATH%\get_vsvars.bat
)
+if defined BASETOOLS_MINGW_BUILD (
+ if not defined IASL_PREFIX (
+ REM For VS builds this environment variable is set via set_vsprefix_envs.bat
+ if exist "C:\ASL\" (
+ set IASL_PREFIX=C:\ASL\
+ ) else (
+ @echo.
+ @echo !!! WARNING !!! IASL_PREFIX environment variable is not set
+ )
+ )
+)
if %SCRIPT_ERROR% NEQ 0 (
@echo.
@echo !!! ERROR !!! %VSTool% is not installed !!!