bpo-34855: Fix EXTERNALS_DIR build variable for Windows (GH-11177) · python/cpython@6aedfa6 (original) (raw)

3 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ jobs:
36 36 Write-Host '##vso[task.setvariable variable=Py_IntDir]$(Build.BinariesDirectory)\obj'
37 37 # UNDONE: Do not build to a different directory because of broken tests
38 38 Write-Host '##vso[task.setvariable variable=Py_OutDir]$(Build.SourcesDirectory)\PCbuild'
39 - Write-Host '##vso[task.setvariable variable=EXTERNAL_DIR]$(Build.BinariesDirectory)\externals'
39 + Write-Host '##vso[task.setvariable variable=EXTERNALS_DIR]$(Build.BinariesDirectory)\externals'
40 40 displayName: Update build locations
41 41
42 42 - script: PCbuild\build.bat -e $(buildOpt)
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ steps:
8 8 Write-Host '##vso[task.setvariable variable=Py_IntDir]$(Build.BinariesDirectory)\obj'
9 9 # UNDONE: Do not build to a different directory because of broken tests
10 10 Write-Host '##vso[task.setvariable variable=Py_OutDir]$(Build.SourcesDirectory)\PCbuild'
11 - Write-Host '##vso[task.setvariable variable=EXTERNAL_DIR]$(Build.BinariesDirectory)\externals'
11 + Write-Host '##vso[task.setvariable variable=EXTERNALS_DIR]$(Build.BinariesDirectory)\externals'
12 12 displayName: Update build locations
13 13
14 14 - script: PCbuild\build.bat -e $(buildOpt)
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
24 24 :begin_search
25 25 @set PYTHON=
26 26
27 -@set _Py_EXTERNALS_DIR=%EXTERNAL_DIR%
27 +@set _Py_EXTERNALS_DIR=%EXTERNALS_DIR%
28 28 @if "%_Py_EXTERNALS_DIR%"=="" (set _Py_EXTERNALS_DIR=%~dp0\..\externals)
29 29
30 30 @rem If we have Python in externals, use that one