From: Wayne Davison <wayne@opencoder.net>
Date: Sat, 18 Jun 2022 16:42:16 +0000 (-0700)
Subject: Avoid -pedantic-errors on non-x86 for the moment.
X-Git-Tag: v3.2.5pre1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=355b81d8bce3d91c4bc5e86e67d3fdb225eef99e;p=thirdparty%2Frsync.git

Avoid -pedantic-errors on non-x86 for the moment.
---

diff --git a/configure.ac b/configure.ac
index 29698bc0..93f222dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1066,7 +1066,11 @@ elif test x"$ac_cv_header_popt_h" != x"yes"; then
     with_included_popt=yes
 fi
 
-if test x"$GCC" = x"yes"; then
+# Some arm systems compute the checksums wrong when -pedantic-errors is set, so we
+# limit this to x86 for the moment (since this should ensure that the main purpose
+# of finding a static-list overflow will still occur on a large number of hosts).
+case "$GCC,$host_cpu" in
+yes,x86_64|yes,amd64)
     if test x"$with_included_popt" != x"yes"; then
 	# Turn pedantic warnings into errors to ensure an array-init overflow is an error.
 	CFLAGS="$CFLAGS -pedantic-errors"
@@ -1079,7 +1083,7 @@ if test x"$GCC" = x"yes"; then
 	    *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;;
 	esac
     fi
-fi
+esac
 
 AC_MSG_CHECKING([whether to use included libpopt])
 if test x"$with_included_popt" = x"yes"; then