summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-06-03 01:05:16 +0100
committerSam James <sam@gentoo.org>2023-06-03 01:48:01 +0100
commit2f8bd00507759447a513a934e440dc2fb49afceb (patch)
treeeb6447db78850a12f4a98ff8104e6c62b2e453ac /eclass/toolchain.eclass
parenttoolchain.eclass: drop legacy cygwin cruft (diff)
downloadgentoo-2f8bd00507759447a513a934e440dc2fb49afceb.tar.gz
gentoo-2f8bd00507759447a513a934e440dc2fb49afceb.tar.bz2
gentoo-2f8bd00507759447a513a934e440dc2fb49afceb.zip
toolchain.eclass: cleanup TOOLCHAIN_SET_S
No need for a subshell. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass/toolchain.eclass')
-rw-r--r--eclass/toolchain.eclass20
1 files 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() {