Skip to content

Fix build error for python 3.11 on win/arm64 target #28491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 4 commits into from
Sep 27, 2021
Merged

Fix build error for python 3.11 on win/arm64 target #28491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41581b2
Fix build error for python 3.11 on win/arm64 target
niyas-sait Sep 21, 2021
6e311e1
pcbuild.sln: Revert target for _freeze_module to win32/x64
niyas-sait Sep 23, 2021
4df75b6
Use PreferredToolArchitecture property to build _freezemodule
niyas-sait Sep 24, 2021
09aa043
Merge branch 'main' into fix_python_311_build_win_arm64
zooba Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions PCbuild/pcbuild.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion Tools/scripts/freeze_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import os
import ntpath
import posixpath
import platform
import subprocess
import sys
import textwrap
Expand Down Expand Up @@ -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):
Expand Down