commit:     cb1bf7319d22a2a4fb9c7c300f092154922f98b9
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 09:10:33 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 09:12:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb1bf731

www-client/firefox: disable elf-hack again with mold linker (119.0)

 - the new relr-elfhack doesn't work with mold.

Closes: https://bugs.gentoo.org/916259
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-client/firefox/firefox-119.0.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/www-client/firefox/firefox-119.0.ebuild 
b/www-client/firefox/firefox-119.0.ebuild
index 13d0e1b403ba..fb9a32336ba3 100644
--- a/www-client/firefox/firefox-119.0.ebuild
+++ b/www-client/firefox/firefox-119.0.ebuild
@@ -1062,10 +1062,15 @@ src_configure() {
 
        # elf-hack
        if use amd64 || use x86 ; then
-               if use clang ; then
-                       mozconfig_add_options_ac 'relr elf-hack with clang' 
--enable-elf-hack=relr
+               if tc-ld-is-mold ; then
+                       # relr-elf-hack is currently broken with mold, 
bgo#916259
+                       mozconfig_add_options_ac 'disable elf-hack with mold 
linker' --disable-elf-hack
                else
-                       mozconfig_add_options_ac 'legacy elf-hack with gcc' 
--enable-elf-hack=legacy
+                       if use clang ; then
+                               mozconfig_add_options_ac 'relr elf-hack with 
clang' --enable-elf-hack=relr
+                       else
+                               mozconfig_add_options_ac 'legacy elf-hack with 
gcc' --enable-elf-hack=legacy
+                       fi
                fi
        else
                mozconfig_add_options_ac 'disable elf-hack on non-supported 
arches' --disable-elf-hack

Reply via email to