From 6655c39fd0e2a1b558786cace02d6d77a8a95cf1 Mon Sep 17 00:00:00 2001 From: Dan Kegel Date: Sun, 3 Apr 2022 11:27:39 -0700 Subject: [PATCH] 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. --- test/abicheck.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/abicheck.sh b/test/abicheck.sh index 5b720acf..4267aff9 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 -- 2.47.2