diff options
| -rw-r--r-- | xmake/rules/verilator/verilator.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/verilator/xmake.lua | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/xmake/rules/verilator/verilator.lua b/xmake/rules/verilator/verilator.lua index 6b7267861..0a87c40ff 100644 --- a/xmake/rules/verilator/verilator.lua +++ b/xmake/rules/verilator/verilator.lua @@ -207,7 +207,7 @@ endmodule]]) os.rm(tmpdir) end -function build_cppfiles(target, batchjobs, sourcebatch, opt) +function build_cppfiles(target, jobgraph, sourcebatch, opt) local toolchain = assert(target:toolchain("verilator"), 'we need to set_toolchains("verilator") in target("%s")', target:name()) local verilator = assert(toolchain:config("verilator"), "verilator not found!") local autogendir = path.join(target:autogendir(), "rules", "verilator") @@ -261,7 +261,7 @@ function build_cppfiles(target, batchjobs, sourcebatch, opt) table.insert(sourcebatch_cpp.objectfiles, objectfile) table.insert(sourcebatch_cpp.dependfiles, dependfile) end - build_objectfiles(target, batchjobs, sourcebatch_cpp, opt) + build_objectfiles(target, jobgraph, sourcebatch_cpp, opt) end function buildcmd_vfiles(target, batchcmds, sourcebatch, opt) diff --git a/xmake/rules/verilator/xmake.lua b/xmake/rules/verilator/xmake.lua index 4e6f49397..ca60a3289 100644 --- a/xmake/rules/verilator/xmake.lua +++ b/xmake/rules/verilator/xmake.lua @@ -34,9 +34,9 @@ rule("verilator.binary") -- Just to avoid before_buildcmd_files being executed at build time end) - on_build_files(function (target, batchjobs, sourcebatch, opt) - import("verilator").build_cppfiles(target, batchjobs, sourcebatch, opt) - end, {batch = true, distcc = true}) + on_build_files(function (target, jobgraph, sourcebatch, opt) + import("verilator").build_cppfiles(target, jobgraph, sourcebatch, opt) + end, {jobgraph = true, batch = true, distcc = true}) before_buildcmd_files(function(target, batchcmds, sourcebatch, opt) import("verilator").buildcmd_vfiles(target, batchcmds, sourcebatch, opt) @@ -61,9 +61,9 @@ rule("verilator.static") -- Just to avoid before_buildcmd_files being executed at build time end) - on_build_files(function (target, batchjobs, sourcebatch, opt) - import("verilator").build_cppfiles(target, batchjobs, sourcebatch, opt) - end, {batch = true, distcc = true}) + on_build_files(function (target, jobgraph, sourcebatch, opt) + import("verilator").build_cppfiles(target, jobgraph, sourcebatch, opt) + end, {jobgraph = true, batch = true, distcc = true}) before_buildcmd_files(function(target, batchcmds, sourcebatch, opt) import("verilator").buildcmd_vfiles(target, batchcmds, sourcebatch, opt) |