summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSirLynix <[email protected]>2023-07-21 17:40:20 +0200
committerSirLynix <[email protected]>2023-07-21 17:40:20 +0200
commit7ffdabc0d2a93615ab8ec83b153e7f48854aceea (patch)
treedb4b532946914fb246d91d7f22ce0317d852b999
parent56779b7e083536109d9008059990cff694e01a77 (diff)
Fixes
-rw-r--r--xmake/modules/private/action/run/runenvs.lua2
-rw-r--r--xmake/rules/xcode/application/run.lua2
2 files changed, 1 insertions, 3 deletions
diff --git a/xmake/modules/private/action/run/runenvs.lua b/xmake/modules/private/action/run/runenvs.lua
index 425b119c5..8fec69f80 100644
--- a/xmake/modules/private/action/run/runenvs.lua
+++ b/xmake/modules/private/action/run/runenvs.lua
@@ -72,7 +72,6 @@ function _flatten_envs(envs)
for name, values in pairs(envs) do
flatten_envs[name] = table.concat(values, path.envsep())
end
-
return flatten_envs
end
@@ -81,7 +80,6 @@ function join(addrunenvs, setrunenvs)
if setrunenvs then
table.join2(envs, _flatten_envs(setrunenvs))
end
-
return envs
end
diff --git a/xmake/rules/xcode/application/run.lua b/xmake/rules/xcode/application/run.lua
index 5f7d1585d..9859321bc 100644
--- a/xmake/rules/xcode/application/run.lua
+++ b/xmake/rules/xcode/application/run.lua
@@ -44,7 +44,7 @@ function _run_on_macosx(target, opt)
if option.get("debug") then
debugger.run(targetfile, option.get("arguments"), {addrunenvs = addrunenvs, setrunenvs = setrunenvs})
else
- os.execv(targetfile, option.get("arguments"), {envs = runenvs.join()})
+ os.execv(targetfile, option.get("arguments"), {envs = runenvs.join(addrunenvs, setrunenvs)})
end
-- restore the previous directory