summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-12-01 18:26:34 +0800
committerGitHub <[email protected]>2025-12-01 18:26:34 +0800
commit8c2d23cf3a1e5a92ebecfc1220f76bfe945acc11 (patch)
treec7d057fbc9cb3b5ec36fabf16480c79746c3da9f
parente87feba55758263fd272855c4963e8e8245edd77 (diff)
parent9d3ab09c7e88015ddef3f825cea22517977983c6 (diff)
Merge pull request #7085 from star-hengxing/patch-1
Fix CMake flags for Clang toolchain
-rw-r--r--xmake/modules/package/tools/cmake.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 73976bd78..6745ee5bb 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -882,10 +882,10 @@ function _get_envs_for_flags(package, configs, opt)
-- use clang-cl or clang, and we need pass --target=xxx flags
if package:has_tool("cc", "clang", "clang_cl") then
-- @see https://github.com/xmake-io/xmake-repo/issues/7662
- platform_envs.CMAKE_C_FLAGS = _get_cflags(package, {cross = true, packagedeps = opt.packagedeps})
+ platform_envs.CMAKE_C_FLAGS = _get_cflags(package, table.join({cross = true}, opt))
end
if package:has_tool("cxx", "clang", "clang_cl") then
- platform_envs.CMAKE_CXX_FLAGS = _get_cxxflags(package, {cross = true, packagedeps = opt.packagedeps})
+ platform_envs.CMAKE_CXX_FLAGS = _get_cxxflags(package, table.join({cross = true}, opt))
end
elseif package:is_plat("wasm") then
-- pass toolchain flags cross-compilation