mirror of
https://github.com/miurahr/aqtinstall.git
synced 2025-12-16 20:27:05 +03:00
fail correctly for windows_arm64 paired with win64_msvc2022_arm64_cross_compiled.
This commit is contained in:
@@ -425,8 +425,10 @@ class QtArchives:
|
||||
|
||||
if self.version >= Version("6.8.0"):
|
||||
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)
|
||||
if self.os_name == "windows_arm64":
|
||||
arch = self.arch.replace("win64_", "", 1)
|
||||
elif self.os_name == "linux":
|
||||
arch = "x86_64"
|
||||
elif self.os_name == "linux_arm64":
|
||||
|
||||
@@ -294,8 +294,10 @@ class ArchiveId:
|
||||
|
||||
def to_extension_folder(self, module, version, arch) -> str:
|
||||
extarch = arch
|
||||
if self.host == "windows" or self.host == "windows_arm64":
|
||||
if self.host == "windows":
|
||||
extarch = arch.replace("win64_", "", 1).replace("_cross_compiled", "", 1)
|
||||
elif self.host == "windows_arm64":
|
||||
extarch = arch.replace("win64_", "", 1)
|
||||
elif self.host == "linux":
|
||||
extarch = "x86_64"
|
||||
elif self.host == "linux_arm64":
|
||||
|
||||
Reference in New Issue
Block a user