diff options
| author | ruki <[email protected]> | 2024-07-22 09:47:57 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-22 09:47:57 +0800 |
| commit | e6ba4e15203cf1825efa7fc1f457eff271386ac9 (patch) | |
| tree | dc5e758ca4ea54ddc99e3702257b8b7cbf456f8e /xmake/rules/c++/modules/modules_support | |
| parent | 4c1f120cacbbc3043e7b9cbf71a34d2186064958 (diff) | |
| parent | 7db73f18851c801d8eee42d5191de89e1b3f13af (diff) | |
Merge pull request #5369 from Arthapz/add-culling-policy
add a policy to disable module culling
Diffstat (limited to 'xmake/rules/c++/modules/modules_support')
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/dependency_scanner.lua | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua index d59a4436a..66b00f421 100644 --- a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua +++ b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua @@ -422,11 +422,18 @@ function sort_modules_by_dependencies(target, objectfiles, modules) local objectfiles_sorted_set = hashset.from(objectfiles_sorted) for _, objectfile in ipairs(objectfiles) do if not objectfiles_sorted_set:has(objectfile) then - -- cull unreferenced non-public named module but add non-module files and implementation modules - local _, provide, cppfile = compiler_support.get_provided_module(modules[objectfile]) - local fileconfig = target:fileconfig(cppfile) - local public = fileconfig and fileconfig.public - if not provide or public then + if target:policy("build.c++.modules.culling") then + -- cull unreferenced non-public named module but add non-module files and implementation modules + local _, provide, cppfile = compiler_support.get_provided_module(modules[objectfile]) + local fileconfig = target:fileconfig(cppfile) + local public = fileconfig and fileconfig.public + local dont_cull = fileconfig and fileconfig.cull ~= nil and not fileconfig.cull + if not provide or public or dont_cull then + table.insert(result, objectfile) + else + wprint("%s has been culled because it's not consumed by its target nor flagged as a public module (add_files(\"xxx.cppm\", {public = true}))", cppfile) + end + else table.insert(result, objectfile) end end |