From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 140B615810F for ; Sat, 3 Jun 2023 00:51:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A209E08AD; Sat, 3 Jun 2023 00:51:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E35A9E08AD for ; Sat, 3 Jun 2023 00:51:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD835341173 for ; Sat, 3 Jun 2023 00:51:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E70BEA71 for ; Sat, 3 Jun 2023 00:50:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685753281.2f8bd00507759447a513a934e440dc2fb49afceb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2f8bd00507759447a513a934e440dc2fb49afceb X-VCS-Branch: master Date: Sat, 3 Jun 2023 00:50:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6401a0aa-321a-4f68-bd81-cc8c46d55b26 X-Archives-Hash: 3195bced53ace170a01a013b92d60060 commit: 2f8bd00507759447a513a934e440dc2fb49afceb Author: Sam James gentoo org> AuthorDate: Sat Jun 3 00:05:16 2023 +0000 Commit: Sam James gentoo 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 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() {