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

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     aa16fff9832d0a21149abb2e090252cc9a5bcb51
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 19:00:04 2017 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 19:00:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=aa16fff9

drop gold USE flag and honour whatever binutils-config has set

 eclass/mozconfig-v6.56.eclass   | 12 ++++++++----
 www-client/firefox/metadata.xml |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/mozconfig-v6.56.eclass b/eclass/mozconfig-v6.56.eclass
index 53057f0..c0ecf59 100644
--- a/eclass/mozconfig-v6.56.eclass
+++ b/eclass/mozconfig-v6.56.eclass
@@ -84,7 +84,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5
 # Set the variable to any value if the use flag should exist but not be default-enabled.
 
 # use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug gold neon pulseaudio selinux startup-notification system-harfbuzz
+IUSE="${IUSE} dbus debug neon pulseaudio selinux startup-notification system-harfbuzz
  system-icu system-jpeg system-libevent system-sqlite system-libvpx"
 
 # some notes on deps:
@@ -197,14 +197,18 @@ mozconfig_config() {
 		--with-system-zlib \
 		--with-system-bz2
 
-       # Disable for testing purposes only
-       mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
 
 	# Must pass release in order to properly select linker via gold useflag
 	mozconfig_annotate 'Enable by Gentoo' --enable-release
 
 	# Must pass --enable-gold if using ld.gold
-	mozconfig_use_enable gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
 
 	if has bindist ${IUSE}; then
 		mozconfig_use_enable !bindist official-branding

diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index a338b44..66af8a4 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -14,7 +14,6 @@
 	<flag name="gtk2">Use the cairo-gtk2 rendering engine</flag>
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
-	<flag name="gold">Enable use of ld.gold linker</flag>
 	<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
 	<flag name="jemalloc">Enable or disable jemalloc</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,