summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpportunityLiu <[email protected]>2019-08-21 13:20:52 +0800
committerOpportunityLiu <[email protected]>2019-08-21 13:20:52 +0800
commit734b4f3190501de2368241ed95940a6899e7ce0b (patch)
treedb9a83d0da0c5e01d7b5873bb644375ef76e7ed0
parentc6786f85771ce5eed276c8dbf6831d5944c6b1c9 (diff)
rename
-rw-r--r--xmake/modules/private/action/run/make_runenvs.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/xmake/modules/private/action/run/make_runenvs.lua b/xmake/modules/private/action/run/make_runenvs.lua
index c42df29b4..91a6185d2 100644
--- a/xmake/modules/private/action/run/make_runenvs.lua
+++ b/xmake/modules/private/action/run/make_runenvs.lua
@@ -76,16 +76,16 @@ function main(target)
end
end
+ -- add search directories for all dependent shared libraries on windows
if is_plat("windows") or (is_plat("mingw") and is_host("windows")) then
-- get PATH table
- local path = add["PATH"] or set["PATH"]
- if path == nil then
- path = {}
- add["PATH"] = path
+ local pathenv = add["PATH"] or set["PATH"]
+ local runpath = _make_runpath_on_windows(target)
+ if pathenv == nil then
+ add["PATH"] = runpath
+ else
+ table.append(pathenv, table.unpack(runpath))
end
-
- -- add search directories for all dependent shared libraries on windows
- table.append(path, table.unpack(_make_runpath_on_windows(target)))
end
return add, set