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 6A762158087 for ; Fri, 28 Jan 2022 22:10:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5FD72BC003; Fri, 28 Jan 2022 22:10:53 +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 383332BC003 for ; Fri, 28 Jan 2022 22:10:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 BBBF3343228 for ; Fri, 28 Jan 2022 22:10:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 227971EF for ; Fri, 28 Jan 2022 22:10:50 +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: <1643407646.bc56495544b69df93fd54ea44c5f03841bae027f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/binutils/binutils-2.37_p1-r2.ebuild sys-devel/binutils/binutils-9999.ebuild X-VCS-Directories: sys-devel/binutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc56495544b69df93fd54ea44c5f03841bae027f X-VCS-Branch: master Date: Fri, 28 Jan 2022 22:10:50 +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: 5a029900-c96e-4675-8a4a-a73d52b342de X-Archives-Hash: 011cbafa4a6fde70772cfda6223eb152 commit: bc56495544b69df93fd54ea44c5f03841bae027f Author: Sam James gentoo org> AuthorDate: Fri Jan 28 22:07:15 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 28 22:07:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc564955 sys-devel/binutils: really fix PGO for cross (disable it) Closes: https://bugs.gentoo.org/832174 Fixes: 57737c9f2a9ce3e1b2492760e98932b7b9f9eea2 Signed-off-by: Sam James gentoo.org> sys-devel/binutils/binutils-2.37_p1-r2.ebuild | 11 +++++++++-- sys-devel/binutils/binutils-9999.ebuild | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sys-devel/binutils/binutils-2.37_p1-r2.ebuild b/sys-devel/binutils/binutils-2.37_p1-r2.ebuild index bea3128e217f..5a182867fab3 100644 --- a/sys-devel/binutils/binutils-2.37_p1-r2.ebuild +++ b/sys-devel/binutils/binutils-2.37_p1-r2.ebuild @@ -272,10 +272,17 @@ src_configure() { # Ideally we would like automagic-or-disabled here. # But the check does not quite work on i686: bug #760926. $(use_enable cet) - - $(use_enable pgo pgo-build lto) ) + if ! is_cross ; then + myconf+=( $(use_enable pgo pgo-build lto) ) + + if use pgo ; then + export BUILD_CFLAGS="${CFLAGS}" + fi + fi + + if use pgo && ! is_cross ; then export BUILD_CFLAGS="${CFLAGS}" fi diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index b7af0845fd0a..3fdfdf479f26 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -273,10 +273,17 @@ src_configure() { # Ideally we would like automagic-or-disabled here. # But the check does not quite work on i686: bug #760926. $(use_enable cet) - - $(use_enable pgo pgo-build lto) ) + if ! is_cross ; then + myconf+=( $(use_enable pgo pgo-build lto) ) + + if use pgo ; then + export BUILD_CFLAGS="${CFLAGS}" + fi + fi + + if use pgo && ! is_cross ; then export BUILD_CFLAGS="${CFLAGS}" fi