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

[Sam James]

commit:     4d54dd457249954a9e9b54976b82a0f40b1bc16f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 09:14:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 09:37:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d54dd45

toolchain.eclass: simplify TOOLCHAIN_SET_S logic

I've got no idea why I added that indirection before.

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

 eclass/toolchain.eclass | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 51b28b380584..d69e2094dfbb 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -380,17 +380,13 @@ 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_path=
        if tc_is_live ; then
-               s_path=${EGIT_CHECKOUT_DIR}
+               S=${EGIT_CHECKOUT_DIR}
        elif [[ -n ${SNAPSHOT} ]] ; then
-               s_path=${WORKDIR}/gcc-${SNAPSHOT}
+               S=${WORKDIR}/gcc-${SNAPSHOT}
        else
-               s_path=${WORKDIR}/gcc-${GCC_RELEASE_VER}
+               S=${WORKDIR}/gcc-${GCC_RELEASE_VER}
        fi
-
-       S="${s_path}"
-       unset s_path
 fi
 
 gentoo_urls() {