summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-03-25 21:54:12 +0800
committerGitHub <[email protected]>2025-03-25 21:54:12 +0800
commit287680540de502ef8c8415923bf71b4009ae7c76 (patch)
tree2a550813ce03ffc71affa49e14e1c20b3884959f
parent2b5c1847b9c92c65e6bd9fe3c7da92067b78acdd (diff)
parent4390aa02a8db11f86dcbb62c019e4c0e9a4003a1 (diff)
Merge pull request #6251 from xq114/dev
fix compile_commands with nvcc
-rw-r--r--xmake/plugins/project/clang/compile_commands.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/xmake/plugins/project/clang/compile_commands.lua b/xmake/plugins/project/clang/compile_commands.lua
index e0e92f17e..46a9bfa64 100644
--- a/xmake/plugins/project/clang/compile_commands.lua
+++ b/xmake/plugins/project/clang/compile_commands.lua
@@ -180,9 +180,11 @@ function _make_arguments(jsonfile, arguments, opt)
-- translate some unsupported arguments
arguments = _translate_arguments(arguments)
+ -- https://github.com/xmake-io/xmake/issues/6058
local lsp = _get_lsp()
local target = opt.target
- if lsp and lsp == "clangd" and target and target:is_plat("windows") then
+ local cc = path.basename(arguments[1]):lower()
+ if lsp and lsp == "clangd" and target and target:is_plat("windows") and cc ~= "nvcc" then
table.join2(arguments, _get_windows_sdk_arguments(target))
end