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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 063E41382C5 for ; Fri, 22 May 2020 11:33:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1904FE0903; Fri, 22 May 2020 11:33:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D418E0903 for ; Fri, 22 May 2020 11:33:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B6FB34F2B0 for ; Fri, 22 May 2020 11:33:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E8A821E for ; Fri, 22 May 2020 11:33:14 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1590147168.218cc249eb2324b802c7a70a91ae5663d8e12594.slyfox@gentoo> Subject: [gentoo-commits] proj/gcc-config:master commit in: / X-VCS-Repository: proj/gcc-config X-VCS-Files: gcc-config X-VCS-Directories: / X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 218cc249eb2324b802c7a70a91ae5663d8e12594 X-VCS-Branch: master Date: Fri, 22 May 2020 11:33:14 +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: 6b88979d-db53-479b-ac2e-d093a5e35894 X-Archives-Hash: f77fa1130c1b8fc76c547732f0d9eb62 commit: 218cc249eb2324b802c7a70a91ae5663d8e12594 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri May 22 11:32:48 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Fri May 22 11:32:48 2020 +0000 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=218cc249 gcc-config: clarify comments on how aliases are expanded Signed-off-by: Sergei Trofimovich gentoo.org> gcc-config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc-config b/gcc-config index 87f466c..847cde2 100755 --- a/gcc-config +++ b/gcc-config @@ -251,7 +251,7 @@ update_wrappers() { # - ${CTARGET}-gcc-11.0.0 (no gcc-11.0.0 equivalent) # TODO: is it a gcc or toolchain.eclass bug? # - # Cross directory looks liks: + # Cross directory looks like: # /usr/x86_64-pc-linux-gnu/ia64-unknown-linux-gnu/gcc-bin/10.1.0 # Contents look like: # - ${CTARGET}-foo (${CTARGET}-gcc @@ -277,7 +277,7 @@ update_wrappers() { [[ -z ${new_wrappers} ]] && return 1 # First delete the wrappers that the old one provided but the - # new one does not. + # new ones do not. for x in "${old_wrappers[@]}" ; do has "${x}" "${new_wrappers[@]}" && continue rm -f "${EROOT}usr/bin/${x}" "${EROOT}usr/bin/${CTARGET}-${x}" @@ -300,11 +300,14 @@ update_wrappers() { # wrapper (the binary we're 'wrapping') so that we can # sync mtimes together. This makes things like ccache # happy. See Bug #70548 for more info. + # + # x=cc:gcc -> ref=/path/to/gcc ref="${ROOT}${GCC_PATH}/${x#*:}" if [[ ${x} == *:* ]] ; then # Only install a wrapper if the reference binary exists ... [[ -x ${ref} ]] || continue fi + # x=cc:gcc -> x=cc x=${x%:*} if [[ ! -x ${ref} ]] ; then if is_cross_compiler ; then