Signed-off-by: Maciej Barć <[email protected]>
---
eclass/dotnet-pkg-base.eclass | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/eclass/dotnet-pkg-base.eclass b/eclass/dotnet-pkg-base.eclass
index 5b2d6e2dd..35beacfeb 100644
--- a/eclass/dotnet-pkg-base.eclass
+++ b/eclass/dotnet-pkg-base.eclass
@@ -222,20 +222,18 @@ dotnet-pkg-base_setup() {
dotnet_compat_impl_path="$(type -P "${dotnet_compat_impl}")"
if [[ -n ${dotnet_compat_impl_path} ]] ; then
- DOTNET_PKG_EXECUTABLE=${dotnet_compat_impl}
- DOTNET_PKG_EXECUTABLE_PATH="${dotnet_compat_impl_path}"
-
+ DOTNET_PKG_EXECUTABLE="${dotnet_compat_impl}"
break
fi
done
# Link "DOTNET_PKG_EXECUTABLE" to "dotnet" only for the package build.
- local dotnet_spoof_path="${T}"/dotnet_spoof/${DOTNET_PKG_COMPAT}
+ local dotnet_spoof_path="${T}/dotnet_spoof/${DOTNET_PKG_COMPAT}"
mkdir -p "${dotnet_spoof_path}" || die
- ln -s "${DOTNET_PKG_EXECUTABLE_PATH}" "${dotnet_spoof_path}"/dotnet ||
die
+ ln -s "${dotnet_compat_impl_path}" "${dotnet_spoof_path}/dotnet" || die
export PATH="${dotnet_spoof_path}:${PATH}"
- einfo "Using dotnet SDK \"${DOTNET_PKG_EXECUTABLE}\" from
\"${DOTNET_PKG_EXECUTABLE_PATH}\"."
+ einfo "Using dotnet SDK \"${DOTNET_PKG_EXECUTABLE}\" from
\"${dotnet_compat_impl_path}\"."
# The picked "DOTNET_PKG_EXECUTABLE" should set "DOTNET_ROOT" internally
# and not rely upon this environment variable.
--
2.41.0