summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorSitsofe Wheeler <sitsofe@yahoo.com>2018-02-21 18:45:55 +0000
committerSitsofe Wheeler <sitsofe@yahoo.com>2018-02-21 19:23:04 +0000
commitb86770c69424d82449ce7e61a4e1b04ba1295f83 (patch)
tree34a8c3876ba2d065eddc9f9f1ffd0b7697132f35 /configure
parent3a62cbace68d4c55a43d47dc9f4ef052a63bc0af (diff)
downloadfio-b86770c69424d82449ce7e61a4e1b04ba1295f83.tar.gz
fio-b86770c69424d82449ce7e61a4e1b04ba1295f83.tar.bz2
windows: document MinGW zlib install and remove custom zlib search
In 5580d200d7ae49cdb4f30913e3ef2d74e431ff60 ("appveyor: install zlib and minor clean ups") I found AppVeyor builds could use a pre-built, statically linkable zlib from Cygwin/MinGW. Document the MinGW zlib packages in the README and remove the custom Windows zlib searching from the configure script. Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 1 insertions, 11 deletions
diff --git a/configure b/configure
index 5d283d7c..101e667c 100755
--- a/configure
+++ b/configure
@@ -320,18 +320,8 @@ CYGWIN*)
if test -z "${CC}${cross_prefix}"; then
if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
cc="i686-w64-mingw32-gcc"
- if test -e "../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then
- echo "Building with zlib support"
- output_sym "CONFIG_ZLIB"
- echo "LIBS=../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak
- fi
else
cc="x86_64-w64-mingw32-gcc"
- if test -e "../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then
- echo "Building with zlib support"
- output_sym "CONFIG_ZLIB"
- echo "LIBS=../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak
- fi
fi
fi
if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
@@ -359,7 +349,7 @@ CYGWIN*)
static_assert="yes"
ipv6="yes"
mkdir_two="no"
- echo "BUILD_CFLAGS=$CFLAGS -I../zlib -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
+ echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
;;
esac