summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-06-23 10:14:38 +0100
committerSam James <sam@gentoo.org>2023-06-23 10:37:32 +0100
commit4d54dd457249954a9e9b54976b82a0f40b1bc16f (patch)
treefcaa68150348ffa8043ce1ebb72572c3346466be /eclass
parentprofiles: fix mask message typo (diff)
downloadgentoo-4d54dd457249954a9e9b54976b82a0f40b1bc16f.tar.gz
gentoo-4d54dd457249954a9e9b54976b82a0f40b1bc16f.tar.bz2
gentoo-4d54dd457249954a9e9b54976b82a0f40b1bc16f.zip
toolchain.eclass: simplify TOOLCHAIN_SET_S logic
I've got no idea why I added that indirection before. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass10
1 files 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() {