improve xrepo env

3 files changed, 9 insertions, 11 deletions

diff --git a/xmake/actions/config/configheader.lua b/xmake/actions/config/configheader.lua
index 7372f07c8..f57e3efaf 100644
--- a/xmake/actions/config/configheader.lua
+++ b/xmake/actions/config/configheader.lua
@@ -78,16 +78,12 @@ end
 
 -- make the configure file for the given target and dependents
 function _make_for_target_with_deps(targetname)
-
-    -- the target
     local target = project.target(targetname)
-
-    -- make configure for the target
-    _make_for_target(target)
-
-    -- make configure for the dependent targets?
-    for _, dep in ipairs(target:get("deps")) do
-        _make_for_target_with_deps(dep)
+    if target then
+        _make_for_target(target)
+        for _, dep in ipairs(target:get("deps")) do
+            _make_for_target_with_deps(dep)
+        end
     end
 end
 
diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index 2250bfa53..9bdb4ca4d 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -907,7 +907,8 @@ end
 
 -- get the given target
 function project.target(name)
-    return project.targets()[name]
+    local targets = project.targets()
+    return targets and targets[name]
 end
 
 -- get targets
@@ -916,7 +917,7 @@ function project.targets()
     if not targets then
         local ordertargets, errors
         targets, ordertargets, errors = project._load_targets()
-        if not targets or not ordertargets then
+        if errors then
             os.raise(errors)
         end
         project._memcache():set("targets", targets)
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index a6461dceb..703c497fc 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -210,6 +210,7 @@ end
 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})
         local requires, requires_extra = get_requires()
         for _, instance in ipairs(package.load_packages(requires, {requires_extra = requires_extra})) do
             _package_addenvs(envs, instance)