commit: 10a55f5559b471e9f1967d9f66ed70a2421d549b Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed Aug 30 15:01:22 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Aug 30 17:25:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a55f55
www-client/firefox: force use of llvm-readelf Closes: https://bugs.gentoo.org/913130 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32531 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> www-client/firefox/firefox-117.0.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/www-client/firefox/firefox-117.0.ebuild b/www-client/firefox/firefox-117.0.ebuild index 2a9718f34585..03f23bc8a983 100644 --- a/www-client/firefox/firefox-117.0.ebuild +++ b/www-client/firefox/firefox-117.0.ebuild @@ -744,7 +744,6 @@ src_configure() { CXX=${CHOST}-clang++-${version_clang} NM=llvm-nm RANLIB=llvm-ranlib - READELF=llvm-readelf elif ! use clang && ! tc-is-gcc ; then # Force gcc have_switched_compiler=yes @@ -754,7 +753,6 @@ src_configure() { CXX=${CHOST}-g++ NM=gcc-nm RANLIB=gcc-ranlib - READELF=readelf fi if [[ -n "${have_switched_compiler}" ]] ; then @@ -768,7 +766,11 @@ src_configure() { export HOST_CC="$(tc-getBUILD_CC)" export HOST_CXX="$(tc-getBUILD_CXX)" export AS="$(tc-getCC) -c" - tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG + + # Configuration tests expect llvm-readelf output, bug 913130 + READELF="llvm-readelf" + + tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG # Pass the correct toolchain paths through cbindgen if tc-is-cross-compiler ; then
