diff options
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/private/action/require/impl/register_packages.lua | 15 | ||||
| -rw-r--r-- | xmake/modules/private/xrepo/action/env.lua | 12 |
2 files changed, 3 insertions, 24 deletions
diff --git a/xmake/modules/private/action/require/impl/register_packages.lua b/xmake/modules/private/action/require/impl/register_packages.lua index ecab45b7c..1bedc2969 100644 --- a/xmake/modules/private/action/require/impl/register_packages.lua +++ b/xmake/modules/private/action/require/impl/register_packages.lua @@ -25,19 +25,8 @@ import("core.project.project") -- envs: bin path for *.dll, program .. function _register_required_package_envs(instance, envs) for name, values in pairs(instance:envs()) do - if name == "PATH" or name == "LD_LIBRARY_PATH" or name == "DYLD_LIBRARY_PATH" then - for _, value in ipairs(values) do - envs[name] = envs[name] or {} - if path.is_absolute(value) then - table.insert(envs[name], value) - else - table.insert(envs[name], path.join(instance:installdir(), value)) - end - end - else - envs[name] = envs[name] or {} - table.join2(envs[name], values) - end + envs[name] = envs[name] or {} + table.join2(envs[name], values) end end diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua index 4b5bb319e..63ddfae63 100644 --- a/xmake/modules/private/xrepo/action/env.lua +++ b/xmake/modules/private/xrepo/action/env.lua @@ -243,17 +243,7 @@ function _package_addenvs(envs, instance) -- add run envs, e.g. PATH, LD_LIBRARY_PATH, DYLD_LIBRARY_PATH local installdir = instance:installdir() for name, values in pairs(instance:envs()) do - if name == "PATH" or name == "LD_LIBRARY_PATH" or name == "DYLD_LIBRARY_PATH" then - for _, value in ipairs(values) do - if path.is_absolute(value) then - _addenvs(envs, name, value) - else - _addenvs(envs, name, path.join(installdir, value)) - end - end - else - _addenvs(envs, name, table.unpack(table.wrap(values))) - end + _addenvs(envs, name, table.unpack(table.wrap(values))) end -- add library envs, e.g. ACLOCAL_PATH, PKG_CONFIG_PATH, CMAKE_PREFIX_PATH |