[Python-checkins] Fix Windows release builds (GH-17550)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/4ce626eeff8e3fce3cf3d9692a9c6e3ed013442a
commit: 4ce626eeff8e3fce3cf3d9692a9c6e3ed013442a
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-12-09T21:28:10-08:00
summary:

Fix Windows release builds (GH-17550)

(cherry picked from commit abdeb57a212556b4cd3568cca7d316d71a5b8cf0)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M .azure-pipelines/windows-release/build-steps.yml
M .azure-pipelines/windows-release/stage-build.yml

diff --git a/.azure-pipelines/windows-release/build-steps.yml b/.azure-pipelines/windows-release/build-steps.yml
index e2b6683f46e3c..5ca2016d65f9e 100644
--- a/.azure-pipelines/windows-release/build-steps.yml
+++ b/.azure-pipelines/windows-release/build-steps.yml
@@ -43,7 +43,7 @@ steps:
 
 - powershell: |
     $env:SigningCertificate = $null
-    python PC\layout -vv -b "$(Build.BinariesDirectory)\bin" -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default --arch $(Arch)
+    $(_HostPython) PC\layout -vv -b "$(Build.BinariesDirectory)\bin" -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default --arch $(Arch)
     makecat "${env:CAT}.cdf"
     del "${env:CAT}.cdf"
     if (-not (Test-Path "${env:CAT}.cat")) {
diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml
index 60d72b282d1e5..9391a91e30b5e 100644
--- a/.azure-pipelines/windows-release/stage-build.yml
+++ b/.azure-pipelines/windows-release/stage-build.yml
@@ -57,26 +57,31 @@ jobs:
         Arch: win32
         Platform: x86
         Configuration: Release
+        _HostPython: .\python
       win32_d:
         Name: win32_d
         Arch: win32
         Platform: x86
         Configuration: Debug
+        _HostPython: .\python
       amd64_d:
         Name: amd64_d
         Arch: amd64
         Platform: x64
         Configuration: Debug
+        _HostPython: .\python
       arm64:
         Name: arm64
         Arch: arm64
         Platform: ARM64
         Configuration: Release
+        _HostPython: python
       arm64_d:
         Name: arm64_d
         Arch: arm64
         Platform: ARM64
         Configuration: Debug
+        _HostPython: python
 
   steps:
     - template: ./build-steps.yml
@@ -98,6 +103,7 @@ jobs:
         Arch: amd64
         Platform: x64
         Configuration: Release
+        _HostPython: .\python
 
   steps:
     - template: ./build-steps.yml
@@ -123,6 +129,7 @@ jobs:
         Arch: amd64
         Platform: x64
         Configuration: Release
+        _HostPython: .\python
 
   steps:
     - template: ./build-steps.yml