summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-01-28 22:21:42 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-01-28 22:21:42 +0000
commit8c3bf7f28f406e6b302ec1a4d325c615758c04cd (patch)
tree31fdcbe01f355379e8fb9bb0644f1ed9471f837e
parent2022-01-28 22:07:08 UTC (diff)
parentsys-devel/binutils: fix DoubleEmptyLine (diff)
downloadgentoo-8c3bf7f28f406e6b302ec1a4d325c615758c04cd.tar.gz
gentoo-8c3bf7f28f406e6b302ec1a4d325c615758c04cd.tar.bz2
gentoo-8c3bf7f28f406e6b302ec1a4d325c615758c04cd.zip
Merge updates from master
-rw-r--r--sys-devel/binutils/binutils-2.37_p1-r2.ebuild10
-rw-r--r--sys-devel/binutils/binutils-9999.ebuild10
2 files changed, 16 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..438f371da3b9 100644
--- a/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
@@ -272,10 +272,16 @@ 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..9931d3fee518 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -273,10 +273,16 @@ 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