Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fail correctly for windows_arm64 paired with win64_msvc2022_arm64_cross_compiled.

Browse Source
This commit is contained in:
tsteven4
2025-09-16 14:54:19 -06:00
parent ce91d93eee
commit 4a53344c99
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aqt/archives.py
View File

@@ -425,8 +425,10 @@ class QtArchives:
if self.version >= Version("6.8.0"): if self.version >= Version("6.8.0"):
arch = self.arch arch = self.arch
if self.os_name == "windows" or self.os_name == "windows_arm64": if self.os_name == "windows":
arch = self.arch.replace("win64_", "", 1).replace("_cross_compiled", "", 1) arch = self.arch.replace("win64_", "", 1).replace("_cross_compiled", "", 1)
if self.os_name == "windows_arm64":
arch = self.arch.replace("win64_", "", 1)
elif self.os_name == "linux": elif self.os_name == "linux":
arch = "x86_64" arch = "x86_64"
elif self.os_name == "linux_arm64": elif self.os_name == "linux_arm64":

4
aqt/metadata.py
View File

@@ -294,8 +294,10 @@ class ArchiveId:
def to_extension_folder(self, module, version, arch) -> str: def to_extension_folder(self, module, version, arch) -> str:
extarch = arch extarch = arch
if self.host == "windows" or self.host == "windows_arm64": if self.host == "windows":
extarch = arch.replace("win64_", "", 1).replace("_cross_compiled", "", 1) extarch = arch.replace("win64_", "", 1).replace("_cross_compiled", "", 1)
elif self.host == "windows_arm64":
extarch = arch.replace("win64_", "", 1)
elif self.host == "linux": elif self.host == "linux":
extarch = "x86_64" extarch = "x86_64"
elif self.host == "linux_arm64": elif self.host == "linux_arm64":