From 1c73ec7d81f2bda92e008a17966fe8263107d7d6 Mon Sep 17 00:00:00 2001 From: Maxwell Geng <33229754+MaxwellGengYF@users.noreply.github.com> Date: Thu, 27 Nov 2025 11:48:13 +0800 Subject: Save QT rules for llvm-toolchain --- xmake/rules/qt/load.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 492f0fe42..3b489f1ae 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -225,8 +225,8 @@ function main(target, opt) if qt_sdkver:ge("6.0") then -- @see https://github.com/xmake-io/xmake/issues/2071 if target:is_plat("windows") then - target:add("cxxflags", "/Zc:__cplusplus") - target:add("cxxflags", "/permissive-") + target:add("cxxflags", "/Zc:__cplusplus", { tools = {"clang_cl", "cl"} }) + target:add("cxxflags", "/permissive-", { tools = {"clang_cl", "cl"} }) end end -- need c++11 at least -- cgit v1.3.1 From 9732da3b6ed31f883c39a58355abe57c019a4ae1 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 27 Nov 2025 13:53:41 +0800 Subject: Update load.lua --- xmake/rules/qt/load.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 3b489f1ae..9fc204174 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -224,9 +224,9 @@ function main(target, opt) if qt_sdkver:ge("6.0") then -- @see https://github.com/xmake-io/xmake/issues/2071 - if target:is_plat("windows") then - target:add("cxxflags", "/Zc:__cplusplus", { tools = {"clang_cl", "cl"} }) - target:add("cxxflags", "/permissive-", { tools = {"clang_cl", "cl"} }) + if target:is_plat("windows") and target:has_tool("cxx", "clang_cl", "cl") then + target:add("cxxflags", "/Zc:__cplusplus") + target:add("cxxflags", "/permissive-") end end -- need c++11 at least -- cgit v1.3.1