summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-01-14 23:28:26 +0800
committerruki <[email protected]>2023-01-14 23:28:26 +0800
commitcce068516110c93852996334f3a80fc9620fa3d3 (patch)
treee0f8060dcc401a482d5de12a8c70ee6816a9abac
parenta9c7152577fcf9d25da945e2f42d418cc4a5ff1b (diff)
fix envs
-rw-r--r--xmake/toolchains/verilator/xmake.lua19
1 files changed, 15 insertions, 4 deletions
diff --git a/xmake/toolchains/verilator/xmake.lua b/xmake/toolchains/verilator/xmake.lua
index f3d93a3db..97eed1aab 100644
--- a/xmake/toolchains/verilator/xmake.lua
+++ b/xmake/toolchains/verilator/xmake.lua
@@ -31,10 +31,6 @@ toolchain("verilator")
local envs = package:get("envs")
if envs then
table.join2(paths, envs.PATH)
- local verilator_root = envs.VERILATOR_ROOT
- if verilator_root then
- toolchain:add("runenvs", "VERILATOR_ROOT", table.unwrap(verilator_root))
- end
end
end
local verilator = find_tool("verilator", {paths = paths})
@@ -48,3 +44,18 @@ toolchain("verilator")
toolchain:configs_save()
return true
end)
+
+ on_load(function (toolchain)
+ if is_host("windows") then
+ for _, package in ipairs(toolchain:packages()) do
+ local envs = package:get("envs")
+ if envs then
+ local verilator_root = envs.VERILATOR_ROOT
+ if verilator_root then
+ toolchain:add("runenvs", "VERILATOR_ROOT", table.unwrap(verilator_root))
+ break
+ end
+ end
+ end
+ end
+ end)