From 583db0d6883a3c4e87744450a7583087d7d5a4cd Mon Sep 17 00:00:00 2001 From: xq114 <1140735506@qq.com> Date: Mon, 1 Aug 2022 11:27:43 +0800 Subject: do not add targetdir to custom venvs --- xmake/modules/private/xrepo/action/env.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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}) -- cgit v1.3.1