From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Mon, 25 Jan 2021 06:26:51 +0000 (-0800)
Subject: Always canonicalize CHOST when building original zlib even after automatic CHOST... 
X-Git-Tag: v2.0.0-RC2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1a807b814e9b1990dda4f80ebc73896c5410acd;p=thirdparty%2Fzlib-ng.git

Always canonicalize CHOST when building original zlib even after automatic CHOST detection.
---

diff --git a/test/abicheck.sh b/test/abicheck.sh
index ca5d2793..89199a59 100755
--- a/test/abicheck.sh
+++ b/test/abicheck.sh
@@ -91,11 +91,11 @@ then
   *-m32*) M32="-m32";;
   *) M32="";;
   esac
-else
-  # Canonicalize CHOST to work around bug in original
-  # zlib's configure
-  export CHOST=$(sh $TESTDIR/../tools/config.sub $CHOST)
 fi
+
+# Canonicalize CHOST to work around bug in original zlib's configure
+export CHOST=$(sh $TESTDIR/../tools/config.sub $CHOST)
+
 if test "$CHOST" = ""
 then
   echo "abicheck: SKIP, as we don't know CHOST"