diff options
author | Ian Stakenvicius <axs@gentoo.org> | 2017-09-29 15:00:04 -0400 |
---|---|---|
committer | Ian Stakenvicius <axs@gentoo.org> | 2017-09-29 15:00:04 -0400 |
commit | aa16fff9832d0a21149abb2e090252cc9a5bcb51 (patch) | |
tree | 1d58e513308a92fa232501e01909474e5f0e360e /eclass | |
parent | firefox: add patch to avoid nICEr implicit declarations (diff) | |
download | mozilla-aa16fff9832d0a21149abb2e090252cc9a5bcb51.tar.gz mozilla-aa16fff9832d0a21149abb2e090252cc9a5bcb51.tar.bz2 mozilla-aa16fff9832d0a21149abb2e090252cc9a5bcb51.zip |
drop gold USE flag and honour whatever binutils-config has set
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/mozconfig-v6.56.eclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/mozconfig-v6.56.eclass b/eclass/mozconfig-v6.56.eclass index 53057f05..c0ecf599 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 |