Skip to content

Commit 2bd5f7e

Browse files
bpo-34855: Fix EXTERNALS_DIR build variable for Windows (GH-11177)
(cherry picked from commit 6aedfa6) Co-authored-by: antektek <[email protected]>
1 parent 1419000 commit 2bd5f7e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.azure-pipelines/windows-appx-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
Write-Host '##vso[task.setvariable variable=Py_IntDir]$(Build.BinariesDirectory)\obj'
3737
# UNDONE: Do not build to a different directory because of broken tests
3838
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'
4040
displayName: Update build locations
4141
4242
- script: PCbuild\build.bat -e $(buildOpt)

.azure-pipelines/windows-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
Write-Host '##vso[task.setvariable variable=Py_IntDir]$(Build.BinariesDirectory)\obj'
99
# UNDONE: Do not build to a different directory because of broken tests
1010
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'
1212
displayName: Update build locations
1313

1414
- script: PCbuild\build.bat -e $(buildOpt)

PCbuild/find_python.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
:begin_search
2525
@set PYTHON=
2626

27-
@set _Py_EXTERNALS_DIR=%EXTERNAL_DIR%
27+
@set _Py_EXTERNALS_DIR=%EXTERNALS_DIR%
2828
@if "%_Py_EXTERNALS_DIR%"=="" (set _Py_EXTERNALS_DIR=%~dp0\..\externals)
2929

3030
@rem If we have Python in externals, use that one

0 commit comments

Comments
 (0)