summaryrefslogtreecommitdiff
path: root/xmake/rules/c++/modules/modules_support/common.lua
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2022-08-06 23:52:08 +0200
committerArthur LAURENT <[email protected]>2022-08-06 23:52:45 +0200
commitf085566ba853eb16c8658da1a38caa3a5e5728d3 (patch)
treebfc2501a3955f114d863982d733a0700cf6351d9 /xmake/rules/c++/modules/modules_support/common.lua
parent2486a47e5997a5e3183e135a2ac86df4c83f5a30 (diff)
feed the linker with the header unit object files
Diffstat (limited to 'xmake/rules/c++/modules/modules_support/common.lua')
-rw-r--r--xmake/rules/c++/modules/modules_support/common.lua5
1 files changed, 1 insertions, 4 deletions
diff --git a/xmake/rules/c++/modules/modules_support/common.lua b/xmake/rules/c++/modules/modules_support/common.lua
index bd1603876..e32637abf 100644
--- a/xmake/rules/c++/modules/modules_support/common.lua
+++ b/xmake/rules/c++/modules/modules_support/common.lua
@@ -252,7 +252,6 @@ function _topological_sort_visit(node, nodes, modules, output)
assert(not node.tempmarked)
node.tempmarked = true
local m1 = modules[node.objectfile]
- assert(m1 and m1.provides)
for _, n in ipairs(nodes) do
if not n.tempmarked then
local m2 = modules[n.objectfile]
@@ -293,7 +292,7 @@ function sort_modules_by_dependencies(objectfiles, modules)
local nodes = {}
for _, objectfile in ipairs(objectfiles) do
local m = modules[objectfile]
- if m and m.provides then
+ if m then
table.insert(nodes, {marked = false, tempmarked = false, objectfile = objectfile})
end
end
@@ -457,13 +456,11 @@ function generate_headerunits_for_batchcmds(target, batchcmds, sourcebatch, modu
local headerunits_flags = localcache():get("headerunits_flags")
if stl_headerunits then
modules_support(target).generate_stl_headerunits_for_batchcmds(target, batchcmds, stl_headerunits, opt)
- table.join2(headerunits_flags, modules_support(target).generate_stl_headerunits_for_batchcmds(target, batchcmds, stl_headerunits, opt))
end
if user_headerunits then
modules_support(target).generate_user_headerunits_for_batchcmds(target, batchcmds, user_headerunits, opt)
end
end
- return headerunits_flags
end
-- build modules for batchjobs, TODO