From 9129440bc0f65f7aea3ddd1fbfe4c977bac5eaac Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sat, 3 Dec 2022 01:40:33 +0100 Subject: fix msvc and refactor GCC --- xmake/rules/c++/modules/modules_support/msvc.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xmake/rules/c++/modules/modules_support/msvc.lua') diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index 6753021ab..9945185e6 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -443,8 +443,8 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op local modulesjobs = {} for _, objectfile in ipairs(objectfiles) do local module = modules[objectfile] - local cppfile = module.cppfile if module then + local cppfile = module.cppfile local name, provide if module.provides then -- assume there that provides is only one, until we encounter the case @@ -476,14 +476,13 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op table.join2(flags, requiresflags or {}) table.join2(flags, (provide and provide.interface) and interfaceflag or {}) - local fileconfig = target:fileconfig(cppfile) local dependfile = target:dependfile(objectfile) if provide then table.join2(flags, {ifcoutputflag, provide.bmi}) - dependfile = target:dependfile(provide and provide.bmi or objectfile) + dependfile = target:dependfile(provide.bmi) end - if provide then + if provide or common.has_module_extension(cppfile) then _build_modulefile(target, cppfile, { objectfile = objectfile, dependfile = dependfile, -- cgit v1.3.1