diff options
| author | ruki <[email protected]> | 2025-12-01 10:33:45 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-01 10:33:45 +0800 |
| commit | c7e1e6519762517d87e366a9ec7569aa49273f48 (patch) | |
| tree | 216616f20f76b6cf77498d8ea631cde0d610225a | |
| parent | 5c34bd27a63758ac8e826d115b631d38ec576eff (diff) | |
| parent | 5bdd3fb06fdd59f23ce73692a3c07a1779e3bc9e (diff) | |
Merge pull request #7081 from Shiffted/fix_get_headerunit_key
fix `get_headerunit_key`
| -rw-r--r-- | xmake/rules/c++/modules/support.lua | 8 |
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 |
