diff options
| author | ruki <[email protected]> | 2020-03-14 00:38:11 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-13 21:49:06 +0800 |
| commit | 130ef6ca26cf5d29c5e69a2b486ca69c98c3bf6d (patch) | |
| tree | 7e60c00714d4510e62d698ec53639a9cacf0ed82 | |
| parent | 4ebb92ada13b8d521542ec371ee9ec97c90a264d (diff) | |
fix c++.modules
| -rw-r--r-- | xmake/rules/c++/modules/build_modulefiles.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/rules/c++/modules/build_modulefiles.lua b/xmake/rules/c++/modules/build_modulefiles.lua index 8df1dd11c..6f024b0d1 100644 --- a/xmake/rules/c++/modules/build_modulefiles.lua +++ b/xmake/rules/c++/modules/build_modulefiles.lua @@ -36,7 +36,7 @@ function _build_modulefiles_clang(target, sourcebatch, opt) -- compile module files to *.pcm opt = table.join(opt, {configs = {cxxflags = {"-fmodules-ts", "--precompile", "-x c++-module"}}}) - import("private.action.build.object")(target, sourcebatch, opt) + import("private.action.build.object").build(target, sourcebatch, opt) -- compile *.pcm to object files local modulefiles = {} @@ -50,7 +50,7 @@ function _build_modulefiles_clang(target, sourcebatch, opt) end opt.configs = {cxxflags = {"-fmodules-ts"}} opt.quiet = true - import("private.action.build.object")(target, sourcebatch, opt) + import("private.action.build.object").build(target, sourcebatch, opt) -- add module files target:add("cxxflags", "-fmodules-ts") @@ -78,7 +78,7 @@ function _build_modulefiles_gcc(target, sourcebatch, opt) -- compile module file to *.pcm local singlebatch = {sourcekind = "cxx", sourcefiles = {sourcefile}, objectfiles = {objectfile}, dependfiles = {dependfile}} opt.configs.cxxflags = {"-fmodules-ts", "-fmodule-output=" .. modulefile, "-x c++"} - import("private.action.build.object")(target, singlebatch, opt) + import("private.action.build.object").build(target, singlebatch, opt) table.insert(modulefiles, modulefile) table.insert(sourcebatch.objectfiles, objectfile) table.insert(sourcebatch.dependfiles, dependfile) @@ -108,7 +108,7 @@ function _build_modulefiles_msvc(target, sourcebatch, opt) -- compile module file to *.pcm local singlebatch = {sourcekind = "cxx", sourcefiles = {sourcefile}, objectfiles = {objectfile}, dependfiles = {dependfile}} opt.configs.cxxflags = {"/experimental:module /module:interface /module:output " .. os.args(modulefile), "/TP"} - import("private.action.build.object")(target, singlebatch, opt) + import("private.action.build.object").build(target, singlebatch, opt) table.insert(modulefiles, modulefile) table.insert(sourcebatch.objectfiles, objectfile) table.insert(sourcebatch.dependfiles, dependfile) |