commit:     dc4967299a9f7e0ec39906bb14e9ab95fb61eb06
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 00:11:09 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 00:11:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=dc496729

eclass/mozconfig-6.56 - add gold useflag for those wanting to use gold
linker

 eclass/mozconfig-v6.56.eclass | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/mozconfig-v6.56.eclass b/eclass/mozconfig-v6.56.eclass
index 0b3df0e..f1e7262 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 neon pulseaudio selinux startup-notification 
system-harfbuzz
+IUSE="${IUSE} dbus debug gold neon pulseaudio selinux startup-notification 
system-harfbuzz
  system-icu system-jpeg system-libevent system-sqlite system-libvpx"
 
 # some notes on deps:
@@ -200,8 +200,11 @@ mozconfig_config() {
        # Disable for testing purposes only
        mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
 
-       # Enable release to we use system ld
-       mozconfig_annotate 'gentoo ld support' --enable-release
+       # 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 has bindist ${IUSE}; then
                mozconfig_use_enable !bindist official-branding
@@ -254,7 +257,6 @@ mozconfig_config() {
        mozconfig_annotate '' --disable-crashreporter
        mozconfig_annotate 'Gentoo default' --with-system-png
        mozconfig_annotate '' --enable-system-ffi
-       mozconfig_annotate 'Gentoo default to honor system linker' 
--disable-gold
        mozconfig_annotate '' --disable-gconf
        mozconfig_annotate '' --with-intl-api
 

Reply via email to