From 81763dc52a579ae4f2bc8b6a655c092071bf3f2b Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 29 May 2020 22:34:45 +0800 Subject: fix PATH for win/cross toolchains --- xmake/toolchains/cross/xmake.lua | 2 +- xmake/toolchains/llvm/xmake.lua | 2 +- xmake/toolchains/mingw/xmake.lua | 3 +-- 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 -- cgit v1.3.1