summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxq114 <[email protected]>2022-02-09 22:57:14 +0800
committerxq114 <[email protected]>2022-02-09 22:57:14 +0800
commitb1cb2ea8d5bb20a478f21b26cea908b621ac19eb (patch)
tree1babb30e2ec2603a33890f27462e31fa6c1773e2
parent6efa53d991361c262f514246db0f1d808d3b297a (diff)
env file should take priority
-rw-r--r--xmake/modules/private/xrepo/action/env.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index cedd2e339..d2c04a9fe 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -298,10 +298,8 @@ function _package_getenvs(opt)
packages = boundenv or option.get("program")
end
if os.isfile(os.projectfile()) or has_envfile then
- if not os.isfile(os.projectfile()) then
- _enter_project({enteronly = true})
- end
if has_envfile then
+ _enter_project({enteronly = true})
table.insert(project.rcfiles(), boundenv)
end
task.run("config", {target = "all"}, {disable_dump = true})