(C++ modules support) make flag order coherent between different compilers

Author: Arthapz

xmake/rules/c++/modules/clang/builder.lua

@@ -53,6 +53,7 @@ end
 
 function _compile_one_step(target, module, opt)
     -- get flags
+    local module_outputflag = support.get_moduleoutputflag(target)
     if module_outputflag then
         local flags = _make_modulebuildflags(target, module, {bmi = true, objectfile = true})
         if opt and opt.batchcmds then
@@ -101,7 +102,7 @@ function _compile(target, flags, sourcefile, outputfile, opt)
     local dryrun = option.get("dry-run")
     local compinst = target:compiler("cxx")
     local compflags = compinst:compflags({sourcefile = sourcefile, target = target, sourcekind = "cxx"})
-    flags = table.join(flags or {}, compflags or {})
+    flags = table.join(compflags or {}, flags or {})
 
     local bmifile = opt and opt.bmifile
 
@@ -122,7 +123,7 @@ function _batchcmds_compile(batchcmds, target, flags, sourcefile, outputfile, op
     opt = opt or {}
     local compinst = target:compiler("cxx")
     local compflags = compinst:compflags({sourcefile = sourcefile, target = target, sourcekind = "cxx"})
-    flags = table.join("-c", compflags or {}, flags, {"-o", outputfile, opt.bmifile or sourcefile})
+    flags = table.join("-c", compflags or {}, flags or {}, {"-o", outputfile, opt.bmifile or sourcefile})
     batchcmds:compilev(flags, {compiler = compinst, sourcekind = "cxx"})
 end
 

xmake/rules/c++/modules/gcc/builder.lua

@@ -51,7 +51,7 @@ function _compile(target, flags, sourcefile, outputfile)
     local dryrun = option.get("dry-run")
     local compinst = target:compiler("cxx")
     local compflags = compinst:compflags({sourcefile = sourcefile, target = target, sourcekind = "cxx"})
-    flags = table.join(compflags or {}, flags)
+    flags = table.join(compflags or {}, flags or {})
 
     -- trace
     if option.get("verbose") then
@@ -69,7 +69,7 @@ end
 function _batchcmds_compile(batchcmds, target, flags, sourcefile, outputfile)
     local compinst = target:compiler("cxx")
     local compflags = compinst:compflags({sourcefile = sourcefile, target = target, sourcekind = "cxx"})
-    flags = table.join("-c", compflags or {}, flags, {"-o", outputfile, sourcefile})
+    flags = table.join("-c", compflags or {}, flags or {}, {"-o", outputfile, sourcefile})
     batchcmds:compilev(flags, {compiler = compinst, sourcekind = "cxx"})
 end
 

xmake/rules/c++/modules/msvc/builder.lua

@@ -129,7 +129,7 @@ function _batchcmds_compile(batchcmds, target, flags, sourcefile, outputfile)
     opt = opt or {}
     local compinst = target:compiler("cxx")
     local compflags = compinst:compflags({sourcefile = sourcefile, target = target, sourcekind = "cxx"})
-    flags = table.join("/c", compflags or {}, outputfile and "-Fo" .. outputfile or {}, flags or {}, sourcefile or {})
+    flags = table.join("/c", compflags or {}, flags or {}, outputfile and "-Fo" .. outputfile or {}, sourcefile or {})
     batchcmds:compilev(flags, {compiler = compinst, sourcekind = "cxx"})
 end