From dd246227d6c633e180673bceefe8499abc6a4a46 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Mon, 24 Apr 2023 11:15:46 -0600 Subject: 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 --- BaseTools/toolsetup.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'BaseTools/toolsetup.bat') 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 -- cgit v1.2.3