[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     579dc2f7b864d9192d0e1b8a7ee6733c7a9ac992
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 20:34:48 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 20:34:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=579dc2f7

www-client/firefox: Fix lto builds

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 www-client/firefox/firefox-69.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/firefox/firefox-69.0-r1.ebuild b/www-client/firefox/firefox-69.0-r1.ebuild
index 4e89b4f..52dfab5 100644
--- a/www-client/firefox/firefox-69.0-r1.ebuild
+++ b/www-client/firefox/firefox-69.0-r1.ebuild
@@ -257,7 +257,7 @@ src_unpack() {
 src_prepare() {
 	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
 	eapply "${WORKDIR}/firefox"
-	eapply "${FILESDIR}${PN}-69.0-lto-gcc-fix.patch"
+	eapply "${FILESDIR}/${PN}-69.0-lto-gcc-fix.patch"
 
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
@@ -429,7 +429,7 @@ src_configure() {
 		if use clang ; then
 			# This is upstream's default
 			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold || use lto ; then
+		elif tc-ld-is-gold ; then
 			mozconfig_annotate "linker is set to gold" --enable-linker=gold
 		else
 			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd