From 7cfd15a58596c59cec92ce2dcbb16d68f64e3a94 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Sun, 6 Oct 2024 08:42:15 +0900 Subject: [PATCH] fix: arch_dir of win64_llvm_mingw - set arch_dir to be llvm_mingw_64 Signed-off-by: Hiroshi Miura --- aqt/metadata.py | 2 +- aqt/updater.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aqt/metadata.py b/aqt/metadata.py index 2d488ccb..fd24e45a 100644 --- a/aqt/metadata.py +++ b/aqt/metadata.py @@ -387,7 +387,7 @@ def dir_for_version(ver: Version) -> str: @staticmethod def get_arch_dir_name(host: str, arch: str, version: Version) -> str: - if arch.startswith("win64_mingw"): + if arch.startswith("win64") and arch.endswith("mingw"): return arch[6:] + "_64" elif arch.startswith("win32_mingw"): return arch[6:] + "_32" diff --git a/aqt/updater.py b/aqt/updater.py index e891bd9c..849fb9b1 100644 --- a/aqt/updater.py +++ b/aqt/updater.py @@ -228,7 +228,7 @@ def make_qtenv2(self, base_dir, qt_version, arch_dir): f.write("echo Remember to call vcvarsall.bat to complete environment setup!\n") def set_license(self, base_dir: str, qt_version: str, arch_dir: str): - """Update qtconfig.pri as OpenSource""" + """Update qconfig.pri as OpenSource""" with open(os.path.join(base_dir, qt_version, arch_dir, "mkspecs", "qconfig.pri"), "r+") as f: lines = f.readlines() f.seek(0)