diff options
| author | Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> | 2021-04-26 19:11:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 19:11:43 (GMT) |
| commit | 425434dadc30d96dc1c0c628f954f9b6f5edd2c9 (patch) | |
| tree | fd48aff5de9fc1409ae207868bf10554d412f674 | |
| parent | 8a307e488d596914a7a5df6b2fdd945f8ce81e69 (diff) | |
| download | cpython-425434dadc30d96dc1c0c628f954f9b6f5edd2c9.zip cpython-425434dadc30d96dc1c0c628f954f9b6f5edd2c9.tar.gz cpython-425434dadc30d96dc1c0c628f954f9b6f5edd2c9.tar.bz2 | |
bpo-40432: Use python 3.8 or higher to compile CPython on Windows (#25389)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2021-04-20-23-07-22.bpo-40432.9OFpoq.rst | 3 | ||||
| -rw-r--r-- | PCbuild/find_python.bat | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Windows/2021-04-20-23-07-22.bpo-40432.9OFpoq.rst b/Misc/NEWS.d/next/Windows/2021-04-20-23-07-22.bpo-40432.9OFpoq.rst new file mode 100644 index 0000000..6f8ce00 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2021-04-20-23-07-22.bpo-40432.9OFpoq.rst @@ -0,0 +1,3 @@ +Updated pegen regeneration script on Windows to find and use Python 3.8 or +higher. Prior to this, pegen regeneration already required 3.8 or higher, +but the script may have used lower versions of Python. diff --git a/PCbuild/find_python.bat b/PCbuild/find_python.bat index 75413cd..d0e4a86 100644 --- a/PCbuild/find_python.bat +++ b/PCbuild/find_python.bat @@ -34,10 +34,10 @@ @if exist "%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") & (set _Py_Python_Source=found in externals directory) & goto :found @rem If HOST_PYTHON is recent enough, use that -@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 6)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found +@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 8)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found @rem If py.exe finds a recent enough version, use that one -@for %%p in (3.8 3.7 3.6) do @py -%%p -EV >nul 2>&1 && (set PYTHON=py -%%p) && (set _Py_Python_Source=found %%p with py.exe) && goto :found +@for %%p in (3.9 3.8) do @py -%%p -EV >nul 2>&1 && (set PYTHON=py -%%p) && (set _Py_Python_Source=found %%p with py.exe) && goto :found @if NOT exist "%_Py_EXTERNALS_DIR%" mkdir "%_Py_EXTERNALS_DIR%" @set _Py_NUGET=%NUGET% |