[Python-checkins] Select correct tool platform when building on Windows ARM64 natively (GH-28491)
zooba
webhook-mailer at python.org
Mon Sep 27 15:53:05 EDT 2021
https://github.com/python/cpython/commit/adc5d32f474595aa16a90369393440a0bc190777
commit: adc5d32f474595aa16a90369393440a0bc190777
branch: main
author: Niyas Sait <niyas.sait at linaro.org>
committer: zooba <steve.dower at microsoft.com>
date: 2021-09-27T20:52:54+01:00
summary:
Select correct tool platform when building on Windows ARM64 natively (GH-28491)
files:
M PCbuild/pcbuild.proj
M Tools/scripts/freeze_modules.py
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
index b3cbd471c66ac..f32422a0acf44 100644
--- a/PCbuild/pcbuild.proj
+++ b/PCbuild/pcbuild.proj
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
<PropertyGroup Label="Globals">
<ProjectGuid>{CC9B93A2-439D-4058-9D29-6DCF43774405}</ProjectGuid>
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
@@ -15,9 +18,7 @@
<ItemDefinitionGroup>
<FreezeProjects>
- <Platform>$(Platform)</Platform>
- <Platform Condition="$(Platform) == 'ARM'">Win32</Platform>
- <Platform Condition="$(Platform) == 'ARM64'">x64</Platform>
+ <Platform>$(PreferredToolArchitecture)</Platform>
<Configuration>$(Configuration)</Configuration>
<Configuration Condition="$(Configuration) == 'PGInstrument'">Release</Configuration>
<Properties></Properties>
diff --git a/Tools/scripts/freeze_modules.py b/Tools/scripts/freeze_modules.py
index aa799d763a55b..cfc6f7921c974 100644
--- a/Tools/scripts/freeze_modules.py
+++ b/Tools/scripts/freeze_modules.py
@@ -8,6 +8,7 @@
import os
import ntpath
import posixpath
+import platform
import subprocess
import sys
import textwrap
@@ -35,7 +36,10 @@
sys.exit("ERROR: missing _freeze_module")
else:
def find_tool():
- for arch in ['amd64', 'win32']:
+ archs = ['amd64', 'win32']
+ if platform.machine() == "ARM64":
+ archs.append('arm64')
+ for arch in archs:
for exe in ['_freeze_module.exe', '_freeze_module_d.exe']:
tool = os.path.join(ROOT_DIR, 'PCbuild', arch, exe)
if os.path.isfile(tool):
More information about the Python-checkins
mailing list