diff options
| author | antektek <45912913+antektek@users.noreply.github.com> | 2019-01-10 00:19:29 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2019-01-10 00:19:29 (GMT) |
| commit | 6aedfa6b9ac324587f64133c23757a66a8f355bb (patch) | |
| tree | 71cea9044622898712b4039af962a95d1f8780d8 | |
| parent | a306bdd39f5d4a8a615487e7840355e923706811 (diff) | |
| download | cpython-6aedfa6b9ac324587f64133c23757a66a8f355bb.zip cpython-6aedfa6b9ac324587f64133c23757a66a8f355bb.tar.gz cpython-6aedfa6b9ac324587f64133c23757a66a8f355bb.tar.bz2 | |
bpo-34855: Fix EXTERNALS_DIR build variable for Windows (GH-11177)
| -rw-r--r-- | .azure-pipelines/windows-appx-test.yml | 2 | ||||
| -rw-r--r-- | .azure-pipelines/windows-steps.yml | 2 | ||||
| -rw-r--r-- | PCbuild/find_python.bat | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.azure-pipelines/windows-appx-test.yml b/.azure-pipelines/windows-appx-test.yml index 5f3fe6c..cad752b 100644 --- a/.azure-pipelines/windows-appx-test.yml +++ b/.azure-pipelines/windows-appx-test.yml @@ -36,7 +36,7 @@ jobs: Write-Host '##vso[task.setvariable variable=Py_IntDir]$(Build.BinariesDirectory)\obj' # UNDONE: Do not build to a different directory because of broken tests Write-Host '##vso[task.setvariable variable=Py_OutDir]$(Build.SourcesDirectory)\PCbuild' - Write-Host '##vso[task.setvariable variable=EXTERNAL_DIR]$(Build.BinariesDirectory)\externals' + Write-Host '##vso[task.setvariable variable=EXTERNALS_DIR]$(Build.BinariesDirectory)\externals' displayName: Update build locations - script: PCbuild\build.bat -e $(buildOpt) diff --git a/.azure-pipelines/windows-steps.yml b/.azure-pipelines/windows-steps.yml index cba0015..3651ae0 100644 --- a/.azure-pipelines/windows-steps.yml +++ b/.azure-pipelines/windows-steps.yml @@ -8,7 +8,7 @@ steps: Write-Host '##vso[task.setvariable variable=Py_IntDir]$(Build.BinariesDirectory)\obj' # UNDONE: Do not build to a different directory because of broken tests Write-Host '##vso[task.setvariable variable=Py_OutDir]$(Build.SourcesDirectory)\PCbuild' - Write-Host '##vso[task.setvariable variable=EXTERNAL_DIR]$(Build.BinariesDirectory)\externals' + Write-Host '##vso[task.setvariable variable=EXTERNALS_DIR]$(Build.BinariesDirectory)\externals' displayName: Update build locations - script: PCbuild\build.bat -e $(buildOpt) diff --git a/PCbuild/find_python.bat b/PCbuild/find_python.bat index d0778dd..d5c787f 100644 --- a/PCbuild/find_python.bat +++ b/PCbuild/find_python.bat @@ -24,7 +24,7 @@ :begin_search @set PYTHON= -@set _Py_EXTERNALS_DIR=%EXTERNAL_DIR% +@set _Py_EXTERNALS_DIR=%EXTERNALS_DIR% @if "%_Py_EXTERNALS_DIR%"=="" (set _Py_EXTERNALS_DIR=%~dp0\..\externals) @rem If we have Python in externals, use that one |