diff options
| author | Rebecca Cran <rebecca@bsdio.com> | 2023-04-24 11:15:46 -0600 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-05-11 02:14:12 +0000 |
| commit | dd246227d6c633e180673bceefe8499abc6a4a46 (patch) | |
| tree | 1d8d235660e501d072a9db51c2c7e3ae7e7067de | |
| parent | f47415e0315e2b0cf7bf1d00634f46deee802227 (diff) | |
| download | edk2-dd246227d6c633e180673bceefe8499abc6a4a46.tar.gz edk2-dd246227d6c633e180673bceefe8499abc6a4a46.tar.bz2 edk2-dd246227d6c633e180673bceefe8499abc6a4a46.zip | |
BaseTools: Update toolsetup.bat to not use BASETOOLS_PYTHON_SOURCE
The BASETOOLS_PYTHON_SOURCE environment variable is only used temporarily to
set PYTHONPATH. Since it doesn't help improve clarity, remove it.
While here, make sure we set PYTHONPATH when we're using Pip BaseTools
so that build etc. can be found.
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
| -rwxr-xr-x | BaseTools/toolsetup.bat | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index dc6288effd..85104aa224 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -371,14 +371,13 @@ if %ERRORLEVEL% EQU 0 ( @echo Using EDK2 in-source Basetools
if defined BASETOOLS_PYTHON_SOURCE goto print_python_info
set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
- set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
- set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
+ set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH%
goto print_python_info
:use_pip_basetools
@echo Using Pip Basetools
set "PATH=%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%"
- set BASETOOLS_PYTHON_SOURCE=edk2basetools
+ set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH%
goto print_python_info
:print_python_info
|