]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
abicheck.sh: don't export CHOST if it wasn't already exported.
authorDan Kegel <dank@kegel.com>
Sun, 3 Apr 2022 18:27:39 +0000 (11:27 -0700)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Tue, 5 Apr 2022 11:43:37 +0000 (13:43 +0200)
This fixes https://github.com/zlib-ng/zlib-ng/issues/1219,
a regression when running abicheck.sh with default compiler.

test/abicheck.sh

index 5b720acfe736a9314893bb306a10372d74abaa5c..4267aff97d9da7d95471da2332e8167052c18a7c 100755 (executable)
@@ -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