summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoildkv <[email protected]>2021-07-14 23:21:54 +0800
committerGitHub <[email protected]>2021-07-14 23:21:54 +0800
commit5d42d13173294624eb79c5f1c588544799cd3983 (patch)
tree2ffaf643aa714b406f21f57bb4ddcc8d704bcdd7
parent528971ff1ad33097e89aa00161d44e8c6dd5fbf1 (diff)
promote package envs in front of system
-rw-r--r--xmake/modules/private/xrepo/action/env.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index 2a6d9760d..cb6936006 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -248,11 +248,11 @@ function _package_getenvs()
local envs = os.getenvs()
if os.isfile(os.projectfile()) and not option.get("packages") then
task.run("config", {target = "all"}, {disable_dump = true})
+ _toolchain_addenvs(envs)
local requires, requires_extra = get_requires()
for _, instance in ipairs(package.load_packages(requires, {requires_extra = requires_extra})) do
_package_addenvs(envs, instance)
end
- _toolchain_addenvs(envs)
else
local packages = option.get("packages") or option.get("program")
if packages then