diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-12 12:24:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-12 12:24:23 (GMT) |
| commit | cd31de89b083f0dc02aee63895b89d45e6c1ffb9 (patch) | |
| tree | f284c460e00d91f4d010977ef6db1a3c61fa0ebf /win/configure.in | |
| parent | 348739729adc3e690c33831fd8acc535af539dd8 (diff) | |
| download | tcl-cd31de89b083f0dc02aee63895b89d45e6c1ffb9.zip tcl-cd31de89b083f0dc02aee63895b89d45e6c1ffb9.tar.gz tcl-cd31de89b083f0dc02aee63895b89d45e6c1ffb9.tar.bz2 | |
Workaround for mingw-w64 (AMD64-only) bug: It appears that zdll.lib (as produced by Microsoft tools) doesn't import the zlib symbols correctly, so use "libz.dll.a" produced with mingw-w64 tools in stead.
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/win/configure.in b/win/configure.in index 574fce2..373cfcc 100644 --- a/win/configure.in +++ b/win/configure.in @@ -129,7 +129,11 @@ AS_IF([test "${enable_shared+set}" = "set"], [ AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) AS_IF([test "$do64bit" = "yes"], [ - AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib]) + AS_IF([test "$GCC" == "yes"],[ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a]) + ], [ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib]) + ]) ], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) ]) |