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 2C6AA158094 for ; Thu, 22 Sep 2022 23:46:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D5A3E0AFD; Thu, 22 Sep 2022 23:46:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1A0DDE0AFD for ; Thu, 22 Sep 2022 23:46:22 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15253340C02 for ; Thu, 22 Sep 2022 23:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A27085E2 for ; Thu, 22 Sep 2022 23:46:19 +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: <1663890343.1ff1ed38697ed3b376db5c5157fcec24df67aa91.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1ff1ed38697ed3b376db5c5157fcec24df67aa91 X-VCS-Branch: master Date: Thu, 22 Sep 2022 23:46:19 +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: 8178e450-8a7f-4f55-b358-9d6321de2f3c X-Archives-Hash: cc5b7da93d1bb855a85c64c9606637b6 commit: 1ff1ed38697ed3b376db5c5157fcec24df67aa91 Author: Sam James gentoo org> AuthorDate: Thu Sep 22 23:41:28 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 22 23:45:43 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=1ff1ed38 gcc-config: create ${CTARGET}-cc symlink We need this because configure scripts may look for ${CTARGET}-cc first, and while this wasn't a problem in the past, LLVM installs fallback symlinks in /usr/lib/llvm/${SLOT}/bin for the benefit of llvm-only profiles, and configure has started finding these rather than falling back to say, ${CTARGET}-gcc like it has been all this time. Bug: https://bugs.gentoo.org/870577 Bug: https://bugs.gentoo.org/872416 Signed-off-by: Sam James gentoo.org> gcc-config | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc-config b/gcc-config index 65a7ceb..512c41c 100755 --- a/gcc-config +++ b/gcc-config @@ -332,9 +332,16 @@ update_wrappers() { rm -f "${EROOT}usr/bin/${x}" fi done - # legacy cruft, make sure we dont leave it laying around #143205 + + # Legacy cruft, make sure we don't leave it laying around, as we used to install + # genuine wrappers like python-exec, bug #143205 rm -f "${EROOT}usr/bin/${CTARGET}-cc" "${EROOT}usr/bin"/{${CTARGET}-,}g{cc,++}{32,64} + # But create our own ${CTARGET}-cc in /usr/bin to avoid fallbacks + # to the symlinks LLVM creates (sys-devel/clang-toolchain-symlinks). + # bug #872416. + atomic_ln "${EROOT}usr/bin/${CTARGET}-gcc" "${EROOT}usr/bin" "${CTARGET}-cc" + # handle the canonical cpp wrapper if ! is_cross_compiler ; then if [[ ${USE_NATIVE_LINKS} == yes ]]; then