From: Dan Kegel <dank@kegel.com>
Date: Sun, 3 Apr 2022 18:27:39 +0000 (-0700)
Subject: abicheck.sh: don't export CHOST if it wasn't already exported.
X-Git-Tag: 2.1.0-beta1~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6655c39fd0e2a1b558786cace02d6d77a8a95cf1;p=thirdparty%2Fzlib-ng.git

abicheck.sh: don't export CHOST if it wasn't already exported.

This fixes https://github.com/zlib-ng/zlib-ng/issues/1219,
a regression when running abicheck.sh with default compiler.
---

diff --git a/test/abicheck.sh b/test/abicheck.sh
index 5b720acfe..4267aff97 100755
--- a/test/abicheck.sh
+++ b/test/abicheck.sh
@@ -94,7 +94,11 @@ then
 fi
 
 # Canonicalize CHOST to work around bug in original zlib's configure
-export CHOST=$(sh $TESTDIR/../tools/config.sub $CHOST)
+# (Don't export it if it wasn't already exported, else may cause
+# default compiler detection failure and shared library link error
+# when building both zlib and zlib-ng.
+# See https://github.com/zlib-ng/zlib-ng/issues/1219)
+CHOST=$(sh $TESTDIR/../tools/config.sub $CHOST)
 
 if test "$CHOST" = ""
 then