diff options
| author | SirLynix <[email protected]> | 2023-07-22 20:11:47 +0200 |
|---|---|---|
| committer | SirLynix <[email protected]> | 2023-07-22 20:11:47 +0200 |
| commit | 9a8133afa8597442a7e93d2b10c8715309f09d93 (patch) | |
| tree | ca878ceff5db1b6af8adc1221865094aa3ea407a | |
| parent | 32d1380ab6d9ed97074dd472ec9bcff6c670a2c9 (diff) | |
Fix runenvs.join replacing addenvs instead of adding them
| -rw-r--r-- | xmake/modules/private/action/run/runenvs.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xmake/modules/private/action/run/runenvs.lua b/xmake/modules/private/action/run/runenvs.lua index dd5b7ba4c..1b041055d 100644 --- a/xmake/modules/private/action/run/runenvs.lua +++ b/xmake/modules/private/action/run/runenvs.lua @@ -75,8 +75,9 @@ function _flatten_envs(envs) return flatten_envs end +-- join addenvs and setenvs in a common envs table function join(addenvs, setenvs) - local envs = addenvs and _flatten_envs(addenvs) or {} + local envs = os.joinenvs(addenvs and _flatten_envs(addenvs) or {}) if setenvs then table.join2(envs, _flatten_envs(setenvs)) end |