summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-07-17 18:07:43 +0200
committerThomas Deutschmann <whissi@gentoo.org>2020-07-17 19:16:40 +0200
commit66c428c613d510ea9676a463067106612da92c57 (patch)
treed1f49302a2cc9d3f176159bff777e603239b7dbd /www-client
parentnet-vpn/tor: version bumps to 0.4.2.8, 0.4.3.6, 0.4.4.2-alpha (diff)
downloadgentoo-66c428c613d510ea9676a463067106612da92c57.tar.gz
gentoo-66c428c613d510ea9676a463067106612da92c57.tar.bz2
gentoo-66c428c613d510ea9676a463067106612da92c57.zip
www-client/firefox: non-ESR: unbreak build with >=rust-1.45.0
Link: https://bugzilla.mozilla.org/show_bug.cgi?id=1640982 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'www-client')
-rw-r--r--www-client/firefox/firefox-78.0.2.ebuild7
1 files changed, 7 insertions, 0 deletions
diff --git a/www-client/firefox/firefox-78.0.2.ebuild b/www-client/firefox/firefox-78.0.2.ebuild
index 533c4da067cf..1fcb4d3a7258 100644
--- a/www-client/firefox/firefox-78.0.2.ebuild
+++ b/www-client/firefox/firefox-78.0.2.ebuild
@@ -351,6 +351,13 @@ src_prepare() {
sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
"${S}"/build/moz.configure/rust.configure || die
+ if has_version ">=virtual/rust-1.45.0" ; then
+ einfo "Unbreak build with >=rust-1.45.0, bmo#1640982 ..."
+ sed -i \
+ -e 's/\(^cargo_rustc_flags +=.* \)-Clto\( \|$\)/\1/' \
+ "${S}/config/makefiles/rust.mk" || die
+ fi
+
# Autotools configure is now called old-configure.in
# This works because there is still a configure.in that happens to be for the
# shell wrapper configure script