[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Sam James]

commit:     d99a6d12ded13549fd16b2dce7cda093b437c07a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 04:47:51 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 04:48:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99a6d12

sys-libs/glibc: fix test program for multilib-bootstrap

Fix -Wstrict-prototypes, -Wimplicit-int.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/glibc/glibc-2.38.ebuild | 2 +-
 sys-libs/glibc/glibc-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.38.ebuild b/sys-libs/glibc/glibc-2.38.ebuild
index bdd4d0566e37..c80a8e763200 100644
--- a/sys-libs/glibc/glibc-2.38.ebuild
+++ b/sys-libs/glibc/glibc-2.38.ebuild
@@ -1089,7 +1089,7 @@ glibc_do_configure() {
        # add x32 to it, gcc/glibc don't yet support x32.
        #
        if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
-               echo 'main(){}' > "${T}"/test.c
+               echo 'int main(void){}' > "${T}"/test.c || die
                if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c 
-Wl,-emain -lgcc 2>/dev/null ; then
                        sed -i -e '/^CC = /s:$: 
-B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" 
config.make || die
                fi

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index bdd4d0566e37..c80a8e763200 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1089,7 +1089,7 @@ glibc_do_configure() {
        # add x32 to it, gcc/glibc don't yet support x32.
        #
        if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
-               echo 'main(){}' > "${T}"/test.c
+               echo 'int main(void){}' > "${T}"/test.c || die
                if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c 
-Wl,-emain -lgcc 2>/dev/null ; then
                        sed -i -e '/^CC = /s:$: 
-B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" 
config.make || die
                fi