[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     2f8bd00507759447a513a934e440dc2fb49afceb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 00:05:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 00:48:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8bd005

toolchain.eclass: cleanup TOOLCHAIN_SET_S

No need for a subshell.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index a0b647a5c67a..9565cc8914ef 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -426,15 +426,17 @@ fi
 # Set the source directory depending on whether we're using
 # a live git tree, snapshot, or release tarball.
 if [[ ${TOOLCHAIN_SET_S} == yes ]] ; then
-       S=$(
-               if tc_is_live ; then
-                       echo ${EGIT_CHECKOUT_DIR}
-               elif [[ -n ${SNAPSHOT} ]] ; then
-                       echo ${WORKDIR}/gcc-${SNAPSHOT}
-               else
-                       echo ${WORKDIR}/gcc-${GCC_RELEASE_VER}
-               fi
-       )
+       s_path=
+       if tc_is_live ; then
+               s_path=${EGIT_CHECKOUT_DIR}
+       elif [[ -n ${SNAPSHOT} ]] ; then
+               s_path=${WORKDIR}/gcc-${SNAPSHOT}
+       else
+               s_path=${WORKDIR}/gcc-${GCC_RELEASE_VER}
+       fi
+
+       S="${s_path}"
+       unset s_path
 fi
 
 gentoo_urls() {