Merge pull request #2778 from xmake-io/envs

Improve xrepo.env for target

2 files changed, 7 insertions, 0 deletions

diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index 02ef2c4e7..4b5bb319e 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -27,6 +27,7 @@ import("core.project.config")
 import("core.project.project")
 import("core.tool.toolchain")
 import("lib.detect.find_tool")
+import("private.action.run.make_runenvs")
 import("private.action.require.impl.package")
 import("private.action.require.impl.utils.get_requires")
 
@@ -307,6 +308,11 @@ function _target_addenvs(envs)
                 _addenvs(envs, "DYLD_LIBRARY_PATH", target:targetdir())
             end
         end
+        -- add run environments
+        local addrunenvs = make_runenvs(target)
+        for name, values in pairs(addrunenvs) do
+            _addenvs(envs, name, table.unpack(table.wrap(values)))
+        end
     end
 end
 
diff --git a/xmake/rules/python/xmake.lua b/xmake/rules/python/xmake.lua
index d566fa849..da54ead22 100644
--- a/xmake/rules/python/xmake.lua
+++ b/xmake/rules/python/xmake.lua
@@ -23,6 +23,7 @@ rule("python.library")
     on_config(function (target)
         target:set("kind", "shared")
         target:set("prefixname", "")
+        target:add("runenvs", "PYTHONPATH", target:targetdir())
         local soabi = target:extraconf("rules", "python.library", "soabi")
         if soabi then
             import("lib.detect.find_tool")