From a1a807b814e9b1990dda4f80ebc73896c5410acd Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 24 Jan 2021 22:26:51 -0800
Subject: [PATCH] Always canonicalize CHOST when building original zlib even
 after automatic CHOST detection.

---
 test/abicheck.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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"
-- 
2.47.3