fix package envs

7 files changed, 26 insertions, 3 deletions

diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 0a5038ea0..e5c69e4e5 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -251,6 +251,8 @@ end
 function _instance:manifest_load()
     local manifest_file = self:manifest_file()
     if os.isfile(manifest_file) then
+        
+        -- load manifest
         local manifest, errors = io.load(manifest_file)
         if not manifest then
             os.raise(errors)
@@ -319,9 +321,6 @@ function _instance:envs()
     local envs = self._ENVS
     if not envs then
         envs = {}
-        if self:plat() == os.host() and os.isdir(path.join(self:installdir(), "bin")) then
-            envs.PATH = {"bin"}
-        end
         self._ENVS = envs
     end
     return envs
diff --git a/xmake/repository/packages/7/7z/xmake.lua b/xmake/repository/packages/7/7z/xmake.lua
index 5ddbeed72..74ca171dc 100644
--- a/xmake/repository/packages/7/7z/xmake.lua
+++ b/xmake/repository/packages/7/7z/xmake.lua
@@ -26,6 +26,10 @@ package("7z")
         add_versions("gitlab:16.02", "93c6a14efb6dc9ee2fbb8c8fd4b5f319537c98182f8810f3b25cfa6363d9905b")
     end
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("macosx", "linux", function (package)
         os.vrun("make 7z")
         os.cp("bin", package:installdir())
diff --git a/xmake/repository/packages/a/autoconf/xmake.lua b/xmake/repository/packages/a/autoconf/xmake.lua
index eb571f93a..dbb3dd3d1 100644
--- a/xmake/repository/packages/a/autoconf/xmake.lua
+++ b/xmake/repository/packages/a/autoconf/xmake.lua
@@ -12,6 +12,10 @@ package("autoconf")
         add_versions("2.68", "eff70a2916f2e2b3ed7fe8a2d7e63d72cf3a23684b56456b319c3ebce0705d99")
     end
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package)
     end)
diff --git a/xmake/repository/packages/a/automake/xmake.lua b/xmake/repository/packages/a/automake/xmake.lua
index 6dcd8ef11..63feb9ed4 100644
--- a/xmake/repository/packages/a/automake/xmake.lua
+++ b/xmake/repository/packages/a/automake/xmake.lua
@@ -13,6 +13,10 @@ package("automake")
         add_versions("1.9.5", "68712753fcb756f3707b7da554917afb348450eb8530cae3b623a067078596fd")
     end
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package)
         io.writefile(path.join(package:installdir("share", "aclocal"), "dirlist"), [[
diff --git a/xmake/repository/packages/c/cmake/xmake.lua b/xmake/repository/packages/c/cmake/xmake.lua
index fd1b22be2..7e4294354 100644
--- a/xmake/repository/packages/c/cmake/xmake.lua
+++ b/xmake/repository/packages/c/cmake/xmake.lua
@@ -32,6 +32,10 @@ package("cmake")
         end
     end
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("macosx", function (package)
         os.cp("CMake.app/Contents/bin", package:installdir())
         os.cp("CMake.app/Contents/share", package:installdir())
diff --git a/xmake/repository/packages/l/libtool/xmake.lua b/xmake/repository/packages/l/libtool/xmake.lua
index 6c881c1c2..5c1c60a32 100644
--- a/xmake/repository/packages/l/libtool/xmake.lua
+++ b/xmake/repository/packages/l/libtool/xmake.lua
@@ -12,6 +12,10 @@ package("libtool")
         add_versions("2.4.5", "509cb49c7de14ce7eaf88993cf09fd4071882699dfd874c2e95b31ab107d6987")
     end
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package, {"--disable-dependency-tracking", "--enable-ltdl-install"})
     end)
diff --git a/xmake/repository/packages/p/pkg-config/xmake.lua b/xmake/repository/packages/p/pkg-config/xmake.lua
index 036bc9407..1cfdbf127 100644
--- a/xmake/repository/packages/p/pkg-config/xmake.lua
+++ b/xmake/repository/packages/p/pkg-config/xmake.lua
@@ -11,6 +11,10 @@ package("pkg-config")
         add_versions("0.29.2", "6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591")
     end
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("macosx", "linux", function (package)
         local pcpath = {"/usr/local/lib/pkgconfig", "/usr/lib/pkgconfig"}
         if is_host("macosx") then