diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2012-11-14 23:45:13 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2012-11-14 23:45:13 +0000 |
| commit | c7da86f9a76b189aed33814e07d22df04642438d (patch) | |
| tree | 6ff776011ad561628edc94c019b5c7549225bad8 /infrastructure | |
| parent | 8bde063c5722c725de51a829d536e694c542e936 (diff) | |
Request linker to statically link libz.a, since the default now appears to
be dynamic linking, and that stops the tests from working since they can't
find zlib-1.dll in the PATH.
Remove redundant LIBS that should already be detected and used by the
m4 configury.
Diffstat (limited to 'infrastructure')
| -rwxr-xr-x | infrastructure/mingw/configure.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/infrastructure/mingw/configure.sh b/infrastructure/mingw/configure.sh index 60981946..46a61637 100755 --- a/infrastructure/mingw/configure.sh +++ b/infrastructure/mingw/configure.sh @@ -34,8 +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 -L${LIBZ_PATH}" \ - LIBS="-lcrypto -lws2_32 -lgdi32" + LDFLAGS="-Wl,-Bstatic -mno-cygwin -mthreads -L${DEP_PATH}/lib -L${LIBZ_PATH}" then echo "Error: configure failed, aborting." >&2 exit 1 |