commit:     1387931f892a0eadab06a7f9f6cc2854f1105c24
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 08:35:46 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 09:53:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1387931f

dev-libs/nss: fix bitness check for LTO

Closes: https://bugs.gentoo.org/917792
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/nss/nss-3.96.ebuild | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/dev-libs/nss/nss-3.96.ebuild b/dev-libs/nss/nss-3.96.ebuild
index 5cab1c328c41..35503a7b5874 100644
--- a/dev-libs/nss/nss-3.96.ebuild
+++ b/dev-libs/nss/nss-3.96.ebuild
@@ -105,19 +105,15 @@ nssarch() {
 }
 
 nssbits() {
-       # bgo#917792
-       if tc-is-clang && use x86 ; then
-               filter-lto
-       fi
-
        local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
        if [[ ${1} == BUILD_ ]]; then
                cc=$(tc-getBUILD_CC)
        else
                cc=$(tc-getCC)
        fi
+       # TODO: Port this to toolchain-funcs 
tc-get-ptr-size/tc-get-build-ptr-size
        echo > "${T}"/test.c || die
-       ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || 
die
+       ${cc} ${!cppflags} ${!cflags} -fno-lto -c "${T}"/test.c -o 
"${T}/${1}test.o" || die
        case $(file "${T}/${1}test.o") in
                *32-bit*x86-64*) echo USE_X32=1;;
                *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
@@ -175,10 +171,6 @@ multilib_src_compile() {
                export CC_IS_GCC=1
        elif tc-is-clang; then
                export CC_IS_CLANG=1
-               if use x86 ; then
-                       filter-lto
-                       elog "lto disabled when using clang on x86. bgo#917792"
-               fi
        fi
 
        export NSS_DISABLE_GTESTS=$(usex !test 1 0)

Reply via email to