From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id AEE2B158B20 for ; Wed, 05 Feb 2025 18:40:17 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A3101343074 for ; Wed, 05 Feb 2025 18:40:17 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 77A54110479; Wed, 05 Feb 2025 18:39:35 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AFEB21103CB for ; Wed, 05 Feb 2025 18:39:34 +0000 (UTC) Received: from symphony.aura-online.co.uk (157.2.187.81.in-addr.arpa [81.187.2.157]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: chewi) by smtp.gentoo.org (Postfix) with ESMTPSA id 44DB6342FB5 for ; Wed, 05 Feb 2025 18:39:34 +0000 (UTC) Message-ID: Subject: Re: [gentoo-dev] [PATCH] toolchain-funcs.eclass: avoid using tc-getCPP in compiler checks From: James Le Cuirot To: gentoo-dev@lists.gentoo.org Date: Wed, 05 Feb 2025 18:39:27 +0000 In-Reply-To: <20250205181010.1968506-1-floppym@gentoo.org> References: <20250205181010.1968506-1-floppym@gentoo.org> Autocrypt: addr=chewi@gentoo.org; prefer-encrypt=mutual; keydata=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 Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-ndv5A5FD4lFs8nziuIRz" User-Agent: Evolution 3.52.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 X-Archives-Salt: 40892c41-f6ef-482c-bcc6-338d05217d86 X-Archives-Hash: 1e31b3860e892cbad9436d39327736e3 --=-ndv5A5FD4lFs8nziuIRz Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2025-02-05 at 13:10 -0500, Mike Gilbert wrote: > We usually want to invoke cc -E rather than cpp directly. We should not > rely on the quirk of tc-getCPP defaulting to "cc -E" when CPP is unset. >=20 > Resolves a warning when CPP is set to llvm-cpp, which does not accept > the -E option. >=20 > Closes: https://bugs.gentoo.org/949340 > Signed-off-by: Mike Gilbert > --- > eclass/toolchain-funcs.eclass | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclas= s > index 0abed5b8d75e..754d23f91c06 100644 > --- a/eclass/toolchain-funcs.eclass > +++ b/eclass/toolchain-funcs.eclass > @@ -1,4 +1,4 @@ > -# Copyright 2002-2024 Gentoo Authors > +# Copyright 2002-2025 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > =20 > # @ECLASS: toolchain-funcs.eclass > @@ -900,7 +900,7 @@ tc-get-compiler-type() { > HAVE_GCC > #endif > ' > - local res=3D$($(tc-getCPP "$@") -E -P - <<<"${code}") > + local res=3D$($(tc-getCC "$@") -E -P - <<<"${code}") > =20 > case ${res} in > *HAVE_PATHCC*) echo pathcc;; > @@ -927,7 +927,7 @@ tc-is-clang() { > # compilers rather than maintaining a --version flag matrix, bug #335943= . > _gcc_fullversion() { > local ver=3D"$1"; shift > - set -- $($(tc-getCPP "$@") -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_P= ATCHLEVEL__") > + set -- $($(tc-getCC "$@") -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_PA= TCHLEVEL__") > eval echo "${ver}" > } > =20 > @@ -960,7 +960,7 @@ gcc-micro-version() { > # Internal func. Based on _gcc_fullversion() above. > _clang_fullversion() { > local ver=3D"$1"; shift > - set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ = __clang_patchlevel__") > + set -- $($(tc-getCC "$@") -E -P - <<<"__clang_major__ __clang_minor__ _= _clang_patchlevel__") > eval echo "${ver}" > } > =20 > @@ -1347,14 +1347,14 @@ tc-get-c-rtlib() { > # @FUNCTION: tc-get-ptr-size > # @RETURN: Size of a pointer in bytes for CHOST (e.g. 4 or 8). > tc-get-ptr-size() { > - $(tc-getCPP) -P - <<< __SIZEOF_POINTER__ || > + $(tc-getCC) -E -P - <<< __SIZEOF_POINTER__ || > die "Could not determine CHOST pointer size" > } > =20 > # @FUNCTION: tc-get-build-ptr-size > # @RETURN: Size of a pointer in bytes for CBUILD (e.g. 4 or 8). > tc-get-build-ptr-size() { > - $(tc-getBUILD_CPP) -P - <<< __SIZEOF_POINTER__ || > + $(tc-getBUILD_CC) -E -P - <<< __SIZEOF_POINTER__ || > die "Could not determine CBUILD pointer size" > } > =20 I'm slightly unsure, but this has always confused me. If it works for you..= . --=-ndv5A5FD4lFs8nziuIRz Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEPxcZ3tkwcedKm2a8EiZBXQDdMTcFAmejsF8RHGNoZXdpQGdl bnRvby5vcmcACgkQEiZBXQDdMTenNw/+LVwnn95GMiBWEhBrMkiTCNI6ZQ4LFXC3 wHWwQ6h1htz4MZFvG31BmLlM+yJ8CZTRrHhGGy67J+h2rA2rRzphBsekV8ErwQOK FUFZxGNL1wMxJ8oJG9+BPw2peE8rpsa40qdF4TQ/TERNmr0k4qn6Mwc2FD75sZlP QF2LPPEAfT8FJ2KkpBL04GaHbDUNDz4/fNe3Yj+y+kp/apc9dFUFRYUD/2S09VQe USBwYTCPylcQhWkoaI9CE2tyfuSSYYcbC6B8S+yTDID2yAaT0ETGEBF03RTIzgqm /Yf3c4xcTng+tyW1ltDyoWmHsHwR2vmavPqulgL7yQJrmUGge/SLqyoCXFgVvR2J P7TEIXTtYBIj/qHdjWAvNS0h6ccWSdnyJr5O/JgMTPhVlD6T963qQz04pXTCSoGb KZKaP/LDRTvTxnWn5/l9Qb+oxpthzM91RRpux96ZIvH3uXuhe9O1LxQHc5qbyffs pIjZiAFFuTSv59U0xnxztSsW0bKg7Sgu6KW668pNKPuIXfQhrL6ErfpUXRff1a6o BRRZS/jA9I5KmsGQCWC9ygC2TlUTILeEds3f12JC6c56msBGXcsMhyFAnUG6KRei I0r8t/ue3H7ckp8R5iX4KockfamSvRSuAABU9njjD/drS2v99LuMgVgGLFk3w5h8 tXWH6kRlIhg= =z2R2 -----END PGP SIGNATURE----- --=-ndv5A5FD4lFs8nziuIRz--