From b1cb2ea8d5bb20a478f21b26cea908b621ac19eb Mon Sep 17 00:00:00 2001
From: xq114 <1140735506@qq.com>
Date: Wed, 9 Feb 2022 22:57:14 +0800
Subject: env file should take priority

---
 xmake/modules/private/xrepo/action/env.lua | 4 +---
 1 file changed, 1 insertion(+), 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})
-- 
cgit v1.3.1