Too many fixes need backporting for GCC8...

... so instead, disable -Werror for older versions of glibc.

Signed-off-by: Alexey Neyman <stilor@att.net>

1 files changed, 1 insertions, 7 deletions

diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 4b1c688..2f257b5 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -171,6 +171,7 @@ do_libc_backend_once() {
         *)  extra_config+=("--enable-add-ons=$(do_libc_add_ons_list ,)");;
     esac
 
+    [ "${CT_GLIBC_ENABLE_WERROR}" != "y" ] && extra_config+=("--disable-werror")
     [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
     [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
 
@@ -200,13 +201,6 @@ do_libc_backend_once() {
     glibc_cflags+=" ${CT_GLIBC_EXTRA_CFLAGS}"
     glibc_cflags+=" ${multi_flags}"
 
-    # Before 2.25, glibc didn't use GCC's ifunc attribute, instead creating
-    # the resolvers through some clever assembly. This had the resolver function
-    # aliased with an incompatible type, and GCC8 now complains about it.
-    if [ "${CT_GLIBC_HAS_NEW_IFUNC}" != "y" ]; then
-        glibc_cflags+=" -Wno-error=attribute-alias"
-    fi
-
     # Analyze the resulting options for any extra configure switches to throw in.
     for opt in ${glibc_cflags}; do
         case ${opt} in