summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-05-29 22:34:45 +0800
committerruki <[email protected]>2020-05-29 09:28:35 +0800
commit81763dc52a579ae4f2bc8b6a655c092071bf3f2b (patch)
tree3172f48a8f77da6eb1359828f982b77a45e6483d
parent3233f53139341e09a4a02e31f02aeab7597c7157 (diff)
fix PATH for win/cross toolchains
-rw-r--r--xmake/toolchains/cross/xmake.lua2
-rw-r--r--xmake/toolchains/llvm/xmake.lua2
-rw-r--r--xmake/toolchains/mingw/xmake.lua3
3 files changed, 3 insertions, 4 deletions
diff --git a/xmake/toolchains/cross/xmake.lua b/xmake/toolchains/cross/xmake.lua
index 1cf211646..851fa2cca 100644
--- a/xmake/toolchains/cross/xmake.lua
+++ b/xmake/toolchains/cross/xmake.lua
@@ -64,6 +64,6 @@ toolchain("cross")
-- add bin search library for loading some dependent .dll files windows
local bindir = toolchain:bindir()
if bindir and is_host("windows") then
- os.addenv("PATH", bindir)
+ toolchain:add("runenvs", "PATH", bindir)
end
end)
diff --git a/xmake/toolchains/llvm/xmake.lua b/xmake/toolchains/llvm/xmake.lua
index 53132de83..e438bc5d3 100644
--- a/xmake/toolchains/llvm/xmake.lua
+++ b/xmake/toolchains/llvm/xmake.lua
@@ -58,6 +58,6 @@ toolchain("llvm")
-- add bin search library for loading some dependent .dll files windows
local bindir = toolchain:bindir()
if bindir and is_host("windows") then
- os.addenv("PATH", bindir)
+ toolchain:add("runenvs", "PATH", bindir)
end
end)
diff --git a/xmake/toolchains/mingw/xmake.lua b/xmake/toolchains/mingw/xmake.lua
index c06e1c251..8cc5cb525 100644
--- a/xmake/toolchains/mingw/xmake.lua
+++ b/xmake/toolchains/mingw/xmake.lua
@@ -40,11 +40,10 @@ toolchain("mingw")
cross = config.get("cross") or ""
end
- -- TODO add to environment module
-- add bin search library for loading some dependent .dll files windows
local bindir = toolchain:bindir()
if bindir and is_host("windows") then
- os.addenv("PATH", bindir)
+ toolchain:add("runenvs", "PATH", bindir)
end
-- set toolsets