Support Verilator target build to static library #5060

2 files changed, 33 insertions, 5 deletions

diff --git a/xmake/rules/verilator/verilator.lua b/xmake/rules/verilator/verilator.lua
index 321191666..6b7267861 100644
--- a/xmake/rules/verilator/verilator.lua
+++ b/xmake/rules/verilator/verilator.lua
@@ -174,9 +174,9 @@ endmodule]])
     if not os.isfile(autogendir) then
         os.mkdir(autogendir)
     end
-    target:add("includedirs", autogendir)
-    target:add("includedirs", path.join(verilator_root, "include"))
-    target:add("includedirs", path.join(verilator_root, "include", "vltstd"))
+    target:add("includedirs", autogendir, {public = true})
+    target:add("includedirs", path.join(verilator_root, "include"), {public = true})
+    target:add("includedirs", path.join(verilator_root, "include", "vltstd"), {public = true})
 
     -- set languages
     local languages = target:get("languages")
@@ -188,12 +188,12 @@ endmodule]])
         end
     end
     if not cxxlang then
-        target:add("languages", "c++20")
+        target:add("languages", "c++20", {public = true})
     end
 
     -- add definitions for switches
     for k, v in table.orderpairs(switches) do
-        target:add("defines", "VM_" .. k .. "=" .. v)
+        target:add("defines", "VM_" .. k .. "=" .. v, {public = true})
     end
 
     -- add syslinks
diff --git a/xmake/rules/verilator/xmake.lua b/xmake/rules/verilator/xmake.lua
index 4272ed91f..76d213096 100644
--- a/xmake/rules/verilator/xmake.lua
+++ b/xmake/rules/verilator/xmake.lua
@@ -20,6 +20,7 @@
 
 -- @see https://github.com/xmake-io/xmake/issues/3257
 rule("verilator.binary")
+    add_deps("c++")
     set_extensions(".v", ".sv")
     on_load(function (target)
         target:set("kind", "binary")
@@ -45,3 +46,30 @@ rule("verilator.binary")
         import("verilator").buildcmd_cppfiles(target, batchcmds, sourcebatch, opt)
     end)
 
+rule("verilator.static")
+    add_deps("c++")
+    set_extensions(".v", ".sv")
+    on_load(function (target)
+        target:set("kind", "static")
+    end)
+
+    on_config(function (target)
+        import("verilator").config(target)
+    end)
+
+    before_build_files(function (target, sourcebatch)
+        -- 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})
+
+    before_buildcmd_files(function(target, batchcmds, sourcebatch, opt)
+        import("verilator").buildcmd_vfiles(target, batchcmds, sourcebatch, opt)
+    end)
+
+    on_buildcmd_files(function (target, batchcmds, sourcebatch, opt)
+        import("verilator").buildcmd_cppfiles(target, batchcmds, sourcebatch, opt)
+    end)
+