From 7dddd612be834b00a4c4664289d7542b1039019d Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Sun, 30 Jul 2023 22:19:00 +0800 Subject: [PATCH] qtifw: use 7z on windows but not on sub_host msys (#2378) --- packages/q/qtifw/xmake.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/q/qtifw/xmake.lua b/packages/q/qtifw/xmake.lua index d0200345a..70ee3f8b9 100644 --- a/packages/q/qtifw/xmake.lua +++ b/packages/q/qtifw/xmake.lua @@ -30,7 +30,12 @@ package("qtifw") local target = "desktop" local version = package:version() local installdir = package:installdir() - os.vrunv("aqt", {"install-tool", "-O", installdir, host, target, "tools_ifw", "qt.tools.ifw." .. version:major() .. version:minor()}) + local qtifw_version = "qt.tools.ifw." .. version:major() .. version:minor() + if is_host("windows") and (not is_subhost("msys")) then + os.vrunv("aqt", {"install-tool", "-O", installdir, host, target, "tools_ifw", qtifw_version, "--external", "7z"}) + else + os.vrunv("aqt", {"install-tool", "-O", installdir, host, target, "tools_ifw", qtifw_version}) + end os.mv(path.join(installdir, "Tools", "*", version:major() .. "." .. version:minor(), "*"), installdir) os.rmdir(path.join(installdir, "Tools")) end)