From 8ff9ac175a2ee4e4a994b571e585f610c86de5c3 Mon Sep 17 00:00:00 2001 From: 24bit-xjkp <2283572185@qq.com> Date: Sun, 4 Jan 2026 21:59:52 +0800 Subject: fix(rule/verilator): Fix c++ language detect --- xmake/rules/verilator/verilator.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xmake/rules/verilator/verilator.lua b/xmake/rules/verilator/verilator.lua index 8e8b2e297..4631c5886 100644 --- a/xmake/rules/verilator/verilator.lua +++ b/xmake/rules/verilator/verilator.lua @@ -124,10 +124,6 @@ function _get_lanuage_flags(target) end end ---- @brief get makefile type ---- @param verilator string verilator program path ---- @return boolean support_json Whether support json ---- @return string makefile_type Makefile type, json or cmake function _get_makefile_type(verilator) local tool = assert(find_tool("verilator", { program = verilator, version = true }), "verilator not found!") local version = tool.version @@ -233,7 +229,7 @@ endmodule]]) local languages = target:get("languages") local cxxlang = false for _, lang in ipairs(languages) do - if lang:startswith("cxx") or lang:startswith("c++") then + if lang:find("xx", 1, true) or lang:find("++", 1, true) then cxxlang = true break end -- cgit v1.3.1