diff options
| author | Arthur LAURENT <[email protected]> | 2022-12-07 23:24:27 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2022-12-07 23:24:27 +0100 |
| commit | 77c633dc1b5b0ada45dd4907cea57fa34d8cd770 (patch) | |
| tree | 38d6a0a8d77a1f851394f08a517ea19626b18fe0 /xmake/rules/c++/modules/modules_support | |
| parent | 8c3b2f5d51c4f4cb27c2daee16096837fab9a574 (diff) | |
code cleanup
Diffstat (limited to 'xmake/rules/c++/modules/modules_support')
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/gcc.lua | 3 | ||||
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/msvc.lua | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/xmake/rules/c++/modules/modules_support/gcc.lua b/xmake/rules/c++/modules/modules_support/gcc.lua index 9882e5805..3f377a531 100644 --- a/xmake/rules/c++/modules/modules_support/gcc.lua +++ b/xmake/rules/c++/modules/modules_support/gcc.lua @@ -107,8 +107,7 @@ function _build_modulefile(target, sourcefile, opt) local objectfile = opt.objectfile local dependfile = opt.dependfile local compinst = compiler.load("cxx", {target = target}) - local modulemapperflag = get_modulemapperflag(target) - local compflags = table.join("-x", "c++", modulemapperflag .. path.translate(_get_module_mapper(target)), compinst:compflags({target = target})) + local compflags = table.join("-x", "c++", compinst:compflags({target = target})) local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) -- need build this object? diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index 756f19703..5e56b1241 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -732,9 +732,6 @@ function get_requiresflags(target, requires, opt) table.join2(flags, modulemap_[name].flag) table.join2(flags, modulemap_[name].deps or {}) already_mapped_modules[name] = true - if os.isfile(modulemap_[name].objectfile) then - _add_objectfile_to_link_arguments(target, modulemap_[name].objectfile) - end goto continue end end |