summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib/zlib-src/configure
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/zlib/zlib-src/configure')
-rwxr-xr-xBuild/source/libs/zlib/zlib-src/configure48
1 files changed, 27 insertions, 21 deletions
diff --git a/Build/source/libs/zlib/zlib-src/configure b/Build/source/libs/zlib/zlib-src/configure
index e974d1fd799..52ff4a04ea8 100755
--- a/Build/source/libs/zlib/zlib-src/configure
+++ b/Build/source/libs/zlib/zlib-src/configure
@@ -87,6 +87,7 @@ build64=0
gcc=0
warn=0
debug=0
+sanitize=0
old_cc="$CC"
old_cflags="$CFLAGS"
OBJC='$(OBJZ) $(OBJG)'
@@ -137,6 +138,7 @@ case "$1" in
-c* | --const) zconst=1; shift ;;
-w* | --warn) warn=1; shift ;;
-d* | --debug) debug=1; shift ;;
+ --sanitize) sanitize=1; shift ;;
*)
echo "unknown option: $1" | tee -a configure.log
echo "$0 --help for help" | tee -a configure.log
@@ -165,8 +167,14 @@ extern int getchar();
int hello() {return getchar();}
EOF
-test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
-cc=${CC-${CROSS_PREFIX}gcc}
+if test -z "$CC"; then
+ echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
+ if ${CROSS_PREFIX}gcc -v >/dev/null 2>&1; then
+ cc=${CROSS_PREFIX}gcc
+ else
+ cc=${CROSS_PREFIX}cc
+ fi
+fi
cflags=${CFLAGS-"-O3"}
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
case "$cc" in
@@ -199,6 +207,9 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
fi
fi
+ if test $sanitize -eq 1; then
+ CFLAGS="${CFLAGS} -fsanitize=address"
+ fi
if test $debug -eq 1; then
CFLAGS="${CFLAGS} -DZLIB_DEBUG"
SFLAGS="${SFLAGS} -DZLIB_DEBUG"
@@ -367,8 +378,11 @@ else
try()
{
show $*
- ( $* ) >> configure.log 2>&1
+ got=`( $* ) 2>&1`
ret=$?
+ if test "$got" != ""; then
+ printf "%s\n" "$got" >> configure.log
+ fi
if test $ret -ne 0; then
echo "(exit code "$ret")" >> configure.log
fi
@@ -381,8 +395,11 @@ tryboth()
show $*
got=`( $* ) 2>&1`
ret=$?
- printf %s "$got" >> configure.log
+ if test "$got" != ""; then
+ printf "%s\n" "$got" >> configure.log
+ fi
if test $ret -ne 0; then
+ echo "(exit code "$ret")" >> configure.log
return $ret
fi
test "$got" = ""
@@ -457,17 +474,11 @@ size_t dummy = 0;
EOF
if try $CC -c $CFLAGS $test.c; then
echo "Checking for size_t... Yes." | tee -a configure.log
- need_sizet=0
else
echo "Checking for size_t... No." | tee -a configure.log
- need_sizet=1
-fi
-
-echo >> configure.log
-
-# find the size_t integer type, if needed
-if test $need_sizet -eq 1; then
- cat > $test.c <<EOF
+ # find a size_t integer type
+ # check for long long
+ cat > $test.c << EOF
long long dummy = 0;
EOF
if try $CC -c $CFLAGS $test.c; then
@@ -495,17 +506,13 @@ EOF
if try $CC $CFLAGS -o $test $test.c; then
sizet=`./$test`
echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
+ CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
+ SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}"
else
- echo "Failed to find a pointer-size integer type." | tee -a configure.log
- leave 1
+ echo "Checking for a pointer-size integer type... not found." | tee -a configure.log
fi
fi
-if test $need_sizet -eq 1; then
- CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
- SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}"
-fi
-
echo >> configure.log
# check for large file support, and if none, check for fseeko()
@@ -849,7 +856,6 @@ echo SHAREDLIBV = $SHAREDLIBV >> configure.log
echo STATICLIB = $STATICLIB >> configure.log
echo TEST = $TEST >> configure.log
echo VER = $VER >> configure.log
-echo Z_U4 = $Z_U4 >> configure.log
echo SRCDIR = $SRCDIR >> configure.log
echo exec_prefix = $exec_prefix >> configure.log
echo includedir = $includedir >> configure.log