summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-03-18 22:36:56 +0800
committerruki <[email protected]>2019-03-18 09:41:37 +0800
commit2990b9f06f2c57c79643aa384b5a58027cdd73bc (patch)
tree84e3adec85ccf2078aad498a6805d8bd2de64442
parent0b5df9fdad06f868d28537746b8b56b3a0bfd18b (diff)
fix package envs
-rw-r--r--xmake/actions/require/impl/environment.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/xmake/actions/require/impl/environment.lua b/xmake/actions/require/impl/environment.lua
index 5c0ba0844..e5534595a 100644
--- a/xmake/actions/require/impl/environment.lua
+++ b/xmake/actions/require/impl/environment.lua
@@ -45,10 +45,12 @@ function _enter_package(package_name, envs, installdir)
for name, values in pairs(envs) do
oldenvs[name] = oldenvs[name] or os.getenv(name)
if name == "PATH" then
- if path.is_absolute(value) then
- os.addenv(name, value)
- else
- os.addenv(name, path.join(installdir, value))
+ for _, value in ipairs(values) do
+ if path.is_absolute(value) then
+ os.addenv(name, value)
+ else
+ os.addenv(name, path.join(installdir, value))
+ end
end
else
os.addenv(name, unpack(values))