From 7ffdabc0d2a93615ab8ec83b153e7f48854aceea Mon Sep 17 00:00:00 2001 From: SirLynix Date: Fri, 21 Jul 2023 17:40:20 +0200 Subject: Fixes --- xmake/modules/private/action/run/runenvs.lua | 2 -- xmake/rules/xcode/application/run.lua | 2 +- 2 files changed, 1 insertion(+), 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 -- cgit v1.3.1