diff options
| author | Tal Einat <taleinat+github@gmail.com> | 2019-11-18 17:32:25 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-11-18 17:32:25 (GMT) |
| commit | ee703cbb418b7458bebb1d26a5e19d6b55280b28 (patch) | |
| tree | a61f3878a1c985a944aff47820545c0d53f4b9d8 | |
| parent | bc7d3aa6d74b718699b7a6bced9b0dfdfbf95c13 (diff) | |
| download | cpython-ee703cbb418b7458bebb1d26a5e19d6b55280b28.zip cpython-ee703cbb418b7458bebb1d26a5e19d6b55280b28.tar.gz cpython-ee703cbb418b7458bebb1d26a5e19d6b55280b28.tar.bz2 | |
bpo-38809: Windows build scripts use python.exe from virtual envs (GH-17164)
https://bugs.python.org/issue38809
| -rw-r--r-- | Misc/NEWS.d/next/Build/2019-11-15-09-25-44.bpo-38809.9jwta6.rst | 2 | ||||
| -rw-r--r-- | PCbuild/find_python.bat | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Build/2019-11-15-09-25-44.bpo-38809.9jwta6.rst b/Misc/NEWS.d/next/Build/2019-11-15-09-25-44.bpo-38809.9jwta6.rst new file mode 100644 index 0000000..10eaf84 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-11-15-09-25-44.bpo-38809.9jwta6.rst @@ -0,0 +1,2 @@ +On Windows, build scripts will now recognize and use python.exe from an +active virtual env. diff --git a/PCbuild/find_python.bat b/PCbuild/find_python.bat index d5c787f..40937a6 100644 --- a/PCbuild/find_python.bat +++ b/PCbuild/find_python.bat @@ -24,6 +24,9 @@ :begin_search @set PYTHON= +@rem If there is an active virtual env, use that one +@if NOT "%VIRTUAL_ENV%"=="" (set PYTHON="%VIRTUAL_ENV%\Scripts\python.exe") & (set _Py_Python_Source=found in virtual env) & goto :found + @set _Py_EXTERNALS_DIR=%EXTERNALS_DIR% @if "%_Py_EXTERNALS_DIR%"=="" (set _Py_EXTERNALS_DIR=%~dp0\..\externals) |