cheng/zlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search for system name in CHOST instead of trying to extract it.

Browse Source
This commit is contained in:
Mark Adler 2022-10-09 16:55:49 -07:00
parent 8cca42c33f
commit 013c0ca0f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -32,7 +32,7 @@ fi
# set command prefix for cross-compilation # set command prefix for cross-compilation
if [ -n "${CHOST}" ]; then if [ -n "${CHOST}" ]; then
uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`" uname=${CHOST}
CROSS_PREFIX="${CHOST}-" CROSS_PREFIX="${CHOST}-"
fi fi
@ -220,14 +220,14 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
uname=`(uname -s || echo unknown) 2>/dev/null` uname=`(uname -s || echo unknown) 2>/dev/null`
fi fi
case "$uname" in case "$uname" in
Linux* | linux* | GNU | GNU/* | solaris*) Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;; LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
*BSD | *bsd* | DragonFly) *BSD | *bsd* | DragonFly)
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
LDCONFIG="ldconfig -m" ;; LDCONFIG="ldconfig -m" ;;
CYGWIN* | Cygwin* | cygwin* | OS/2*) CYGWIN* | Cygwin* | cygwin* | *-cygwin* | OS/2*)
EXE='.exe' ;; EXE='.exe' ;;
MINGW* | mingw*) MINGW* | mingw* | *-mingw*)
rm -f $test.[co] $test $test$shared_ext rm -f $test.[co] $test $test$shared_ext
echo "If this doesn't work for you, try win32/Makefile.gcc." | tee -a configure.log echo "If this doesn't work for you, try win32/Makefile.gcc." | tee -a configure.log
LDSHARED=${LDSHARED-"$cc -shared"} LDSHARED=${LDSHARED-"$cc -shared"}
@ -246,7 +246,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
shared_ext='.sl' shared_ext='.sl'
SHAREDLIB='libz.sl' ;; SHAREDLIB='libz.sl' ;;
esac ;; esac ;;
Darwin* | darwin*) Darwin* | darwin* | *-darwin*)
shared_ext='.dylib' shared_ext='.dylib'
SHAREDLIB=libz$shared_ext SHAREDLIB=libz$shared_ext
SHAREDLIBV=libz.$VER$shared_ext SHAREDLIBV=libz.$VER$shared_ext