diff options
| author | ruki <[email protected]> | 2022-02-09 23:49:08 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-09 23:49:08 +0800 |
| commit | 53f8b1561ae2a7bbdd5c1b210b1f0dad544a611e (patch) | |
| tree | 1babb30e2ec2603a33890f27462e31fa6c1773e2 | |
| parent | 6efa53d991361c262f514246db0f1d808d3b297a (diff) | |
| parent | b1cb2ea8d5bb20a478f21b26cea908b621ac19eb (diff) | |
Merge pull request #2044 from xq114/dev
env file should take priority
| -rw-r--r-- | xmake/modules/private/xrepo/action/env.lua | 4 |
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}) |