From 7828eacc4a461b72adbad3904af94b449fc7361d Mon Sep 17 00:00:00 2001 From: ShifftC Date: Sun, 30 Nov 2025 19:28:48 +0100 Subject: fix get_headerunit_key --- xmake/rules/c++/modules/support.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/rules/c++/modules/support.lua b/xmake/rules/c++/modules/support.lua index 43600c44e..3a617a65e 100644 --- a/xmake/rules/c++/modules/support.lua +++ b/xmake/rules/c++/modules/support.lua @@ -153,8 +153,8 @@ end -- extract defines from flags function get_headerunit_key(target, sourcefile) - local defines = target:get("defines") or {} - local undefines = target:get("undefines") or {} + local defines = table.wrap(target:get("defines")) + local undefines = table.wrap(target:get("undefines")) local fileconfig = target:fileconfig(sourcefile) if fileconfig then table.join(defines, fileconfig.defines or {}) -- cgit v1.3.1 From 5bdd3fb06fdd59f23ce73692a3c07a1779e3bc9e Mon Sep 17 00:00:00 2001 From: ShifftC Date: Sun, 30 Nov 2025 19:35:26 +0100 Subject: fix get_headerunit_key fileconfig --- xmake/rules/c++/modules/support.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/rules/c++/modules/support.lua b/xmake/rules/c++/modules/support.lua index 3a617a65e..1f23ae52a 100644 --- a/xmake/rules/c++/modules/support.lua +++ b/xmake/rules/c++/modules/support.lua @@ -157,8 +157,8 @@ function get_headerunit_key(target, sourcefile) local undefines = table.wrap(target:get("undefines")) local fileconfig = target:fileconfig(sourcefile) if fileconfig then - table.join(defines, fileconfig.defines or {}) - table.join(undefines, fileconfig.undefines or {}) + table.join2(defines, fileconfig.defines or {}) + table.join2(undefines, fileconfig.undefines or {}) end if #defines > 0 then -- cgit v1.3.1