From 600fb4fab529ae55a44ccdfd6045046309db8f4f Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 27 Apr 2019 00:35:02 +0800 Subject: improve os.execv --- xmake/core/base/os.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua index d63cefad3..65852b22c 100644 --- a/xmake/core/base/os.lua +++ b/xmake/core/base/os.lua @@ -612,8 +612,12 @@ function os.execv(program, argv, opt) -- uses the given environments? local envs = nil if opt.envs then - envs = {} + local envars = os.getenvs() for k, v in pairs(opt.envs) do + envars[k] = v + end + envs = {} + for k, v in pairs(envars) do table.insert(envs, k .. '=' .. v) end end -- cgit v1.3.1