sys-libs/glibc: Fix headers-only cross-build for riscv

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index 093ffc207ebd82df4701390fecf53be643f7dddc..fe9feab7f75c0301bbf08df7b8e380dbbbec6937 100644 (file)
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -1006,25 +1006,6 @@ glibc_headers_configure() {
                popd >/dev/null
        fi
 
-       case ${CTARGET} in
-       riscv*)
-               # RISC-V interrogates the compiler to determine which target to
-               # build.  If building the headers then we don't strictly need a
-               # RISC-V compiler, so the built-in definitions that are provided
-               # along with all RISC-V compiler might not exist.  This causes
-               # glibc's RISC-V preconfigure script to blow up.  Since we're just
-               # building the headers any value will actually work here, so just
-               # pick the standard one (rv64g/lp64d) to make the build scripts
-               # happy for now -- the headers are all the same anyway so it
-               # doesn't matter.
-               headers_only_arch_CPPFLAGS+=(
-                       -D__riscv_xlen=64
-                       -D__riscv_flen=64
-                       -D__riscv_float_abi_double=1
-                       -D__riscv_atomic=1
-               ) ;;
-       esac
-
        local myconf=()
        myconf+=(
                --disable-sanity-checks
@@ -1042,6 +1023,24 @@ glibc_headers_configure() {
        # Nothing is compiled here which would affect the headers for the target.
        # So forcing CC/CFLAGS is sane.
        local headers_only_CC=$(tc-getBUILD_CC)
+
+       case ${CTARGET} in
+       riscv*)
+               # RISC-V interrogates the compiler to determine which target to
+               # build.  If building the headers then we don't strictly need a
+               # RISC-V compiler, so the built-in definitions that are provided
+               # along with all RISC-V compiler might not exist.  This causes
+               # glibc's RISC-V preconfigure script to blow up.  Since we're just
+               # building the headers any value will actually work here, so just
+               # pick the standard one (rv64g/lp64d) to make the build scripts
+               # happy for now -- the headers are all the same anyway so it
+               # doesn't matter.
+               # It's not sufficient to shove the flags into CPPFLAGS, they need
+               # to really go *everywhere*.
+               headers_only_CC="${headers_only_CC} -D__riscv_xlen=64 -D__riscv_flen=64 -D__riscv_float_abi_double=1 -D__riscv_atomic=1"
+               ;;
+       esac
+
        local headers_only_CFLAGS="-O1 -pipe"
        local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
        local headers_only_LDFLAGS=""

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 142153734f973dc90448758409668ebd17bb1a65..20846e05faf68d6b136364e98c920f1f299d393b 100644 (file)
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1007,25 +1007,6 @@ glibc_headers_configure() {
                popd >/dev/null
        fi
 
-       case ${CTARGET} in
-       riscv*)
-               # RISC-V interrogates the compiler to determine which target to
-               # build.  If building the headers then we don't strictly need a
-               # RISC-V compiler, so the built-in definitions that are provided
-               # along with all RISC-V compiler might not exist.  This causes
-               # glibc's RISC-V preconfigure script to blow up.  Since we're just
-               # building the headers any value will actually work here, so just
-               # pick the standard one (rv64g/lp64d) to make the build scripts
-               # happy for now -- the headers are all the same anyway so it
-               # doesn't matter.
-               headers_only_arch_CPPFLAGS+=(
-                       -D__riscv_xlen=64
-                       -D__riscv_flen=64
-                       -D__riscv_float_abi_double=1
-                       -D__riscv_atomic=1
-               ) ;;
-       esac
-
        local myconf=()
        myconf+=(
                --disable-sanity-checks
@@ -1043,6 +1024,24 @@ glibc_headers_configure() {
        # Nothing is compiled here which would affect the headers for the target.
        # So forcing CC/CFLAGS is sane.
        local headers_only_CC=$(tc-getBUILD_CC)
+
+       case ${CTARGET} in
+       riscv*)
+               # RISC-V interrogates the compiler to determine which target to
+               # build.  If building the headers then we don't strictly need a
+               # RISC-V compiler, so the built-in definitions that are provided
+               # along with all RISC-V compiler might not exist.  This causes
+               # glibc's RISC-V preconfigure script to blow up.  Since we're just
+               # building the headers any value will actually work here, so just
+               # pick the standard one (rv64g/lp64d) to make the build scripts
+               # happy for now -- the headers are all the same anyway so it
+               # doesn't matter.
+               # It's not sufficient to shove the flags into CPPFLAGS, they need
+               # to really go *everywhere*.
+               headers_only_CC="${headers_only_CC} -D__riscv_xlen=64 -D__riscv_flen=64 -D__riscv_float_abi_double=1 -D__riscv_atomic=1"
+               ;;
+       esac
+
        local headers_only_CFLAGS="-O1 -pipe"
        local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
        local headers_only_LDFLAGS=""