From: antektek <45912913+antektek@users.noreply.github.com>
Date: Thu, 10 Jan 2019 00:19:29 +0000 (+0100)
Subject: bpo-34855: Fix EXTERNALS_DIR build variable for Windows (GH-11177)
X-Git-Tag: v3.8.0a1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6aedfa6b9ac324587f64133c23757a66a8f355bb;p=thirdparty%2FPython%2Fcpython.git

bpo-34855: Fix EXTERNALS_DIR build variable for Windows (GH-11177)
---

diff --git a/.azure-pipelines/windows-appx-test.yml b/.azure-pipelines/windows-appx-test.yml
index 5f3fe6c94578..cad752b0a1e7 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 cba00158ad13..3651ae03bc1d 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 d0778ddd7347..d5c787fd77aa 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