diff options
| author | ruki <[email protected]> | 2022-08-01 11:31:38 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-08-01 11:31:38 +0800 |
| commit | d0ff7053e8960602d0acfd4720973f515571e78a (patch) | |
| tree | 9e60d0e1051a695f6c937174360abd3851444e4b | |
| parent | 91eb9cb299a63b1c4d3cf4dd9be9bdc2a4830aac (diff) | |
| parent | 583db0d6883a3c4e87744450a7583087d7d5a4cd (diff) | |
Merge pull request #2628 from xq114/dev
do not add targetdir to custom venvs
| -rw-r--r-- | xmake/modules/private/xrepo/action/env.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua index 7a14e3b15..10b7ffe0c 100644 --- a/xmake/modules/private/xrepo/action/env.lua +++ b/xmake/modules/private/xrepo/action/env.lua @@ -330,7 +330,9 @@ function _package_getenvs(opt) for _, instance in ipairs(package.load_packages(requires, {requires_extra = requires_extra})) do _package_addenvs(envs, instance) end - _target_addenvs(envs) + if not has_envfile then + _target_addenvs(envs) + end elseif packages then _enter_project() packages = packages:split(',', {plain = true}) |