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 473E3158094 for ; Mon, 10 Oct 2022 14:09:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 809B9E07C5; Mon, 10 Oct 2022 14:09:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68CFEE07C5 for ; Mon, 10 Oct 2022 14:09:51 +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 9079F340F3B for ; Mon, 10 Oct 2022 14:09:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 187CA5D6 for ; Mon, 10 Oct 2022 14:09:49 +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: <1665410843.681d39425a71977ba0850eb88448f831f84dd6eb.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: 681d39425a71977ba0850eb88448f831f84dd6eb X-VCS-Branch: master Date: Mon, 10 Oct 2022 14:09:49 +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: 863362ed-b962-44ba-92cc-2c409ac1ae45 X-Archives-Hash: d5bbf1120dd5d53a75ad585ddbe23568 commit: 681d39425a71977ba0850eb88448f831f84dd6eb Author: Sam James gentoo org> AuthorDate: Mon Oct 10 14:07:23 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 10 14:07:23 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=681d3942 Revert "gcc-config: set CCACHE_COMPILERCHECK to major GCC version" This isn't going to work where the compiler used is Clang but GCC is installed -- we'll end up always using a cache key of the major GCC version, even for say, different Clang versions. Fortunately, using %compiler% -dumpversion instead of %compiler% -v locally will handle it fine as a workaround (to be set in ccache.conf) because since b7a62d5e3f5e6e05c929f225ead22a2981c9f64 in gentoo.git, GCC installs with just the major version in its paths, and -dumpversion reports said major version, not the whole version (can use gcc -dumpfullversion if needed). This reverts commit 3e49f724d090d65b739be1a67f6c40574337a2f7. Bug: https://bugs.gentoo.org/872971 Signed-off-by: Sam James gentoo.org> gcc-config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gcc-config b/gcc-config index 31a7f4a..08002fd 100755 --- a/gcc-config +++ b/gcc-config @@ -747,14 +747,6 @@ switch_profile() { echo "LDPATH=\"${MY_LDPATH}\"" >> "${envd}.tmp" fi - # Avoid ccache cache invalidations where possible between - # snapshots and minor GCC versions, bug #872971. - # For GCC 10, we changed the slotting from e.g. 10.4 -> 10. - local gcc_major_version="${CC_COMP_VERSION%%.*}" - if [[ "${gcc_major_version}" -ge 10 ]] ; then - echo "CCACHE_COMPILERCHECK=\"string:gcc-${gcc_major_version}\"" >> "${envd}.tmp" - fi - # Punt old files; maybe globs too much, but oh well # 'NATIVE' and '.NATIVE' were used by gcc-wrapper before Aug 2018 # and are not used as wrapper is removed.