diff options
author | Chris Wilson <chris+github@qwirx.com> | 2011-10-09 22:16:54 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2011-10-09 22:16:54 +0000 |
commit | 8ede2c87437a2403a6308152af45797211090c32 (patch) | |
tree | ac7b7147aece573b904771e937d59ad0b23fd495 | |
parent | de2468f74a9fdf08415c11a4d0ca54cf03a14d99 (diff) |
Search for libraries in the path where Cygwin installs MinGW zlib as well
-rwxr-xr-x | infrastructure/mingw/configure.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/infrastructure/mingw/configure.sh b/infrastructure/mingw/configure.sh index 9a0aa363..60981946 100755 --- a/infrastructure/mingw/configure.sh +++ b/infrastructure/mingw/configure.sh @@ -16,7 +16,9 @@ if [ ! -r "$DEP_PATH/lib/libpcreposix.a" \ exit 2 fi -if [ ! -r "$DEP_PATH/sys-root/mingw/lib/libz.dll.a" ]; then +LIBZ_PATH="${DEP_PATH}/sys-root/mingw/lib" + +if [ ! -r "$LIBZ_PATH/libz.dll.a" ]; then echo "Error: upgrade your Cygwin mingw-zlib-devel package" >&2 exit 2 fi @@ -32,7 +34,7 @@ if ! ./configure "$@" --target=i686-pc-mingw32 \ CFLAGS="-mno-cygwin -mthreads" \ CPPFLAGS="-mno-cygwin" \ CXXFLAGS="-mno-cygwin -mthreads" \ - LDFLAGS="-mno-cygwin -mthreads -L${DEP_PATH}/lib" \ + LDFLAGS="-mno-cygwin -mthreads -L${DEP_PATH}/lib -L${LIBZ_PATH}" \ LIBS="-lcrypto -lws2_32 -lgdi32" then echo "Error: configure failed, aborting." >&2 |