summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/rules/c++/modules/support.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/rules/c++/modules/support.lua b/xmake/rules/c++/modules/support.lua
index 43600c44e..1f23ae52a 100644
--- a/xmake/rules/c++/modules/support.lua
+++ b/xmake/rules/c++/modules/support.lua
@@ -153,12 +153,12 @@ 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 {})
- table.join(undefines, fileconfig.undefines or {})
+ table.join2(defines, fileconfig.defines or {})
+ table.join2(undefines, fileconfig.undefines or {})
end
if #defines > 0 then