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 | 169288808baa8f9a7b98f2af49f7a2b88433ec09 (patch) | |
| tree | f284c460e00d91f4d010977ef6db1a3c61fa0ebf /win/configure | |
| parent | 615ab1a0d424b7844200e3d95957f2b418c9369b (diff) | |
| download | tcl-169288808baa8f9a7b98f2af49f7a2b88433ec09.zip tcl-169288808baa8f9a7b98f2af49f7a2b88433ec09.tar.gz tcl-169288808baa8f9a7b98f2af49f7a2b88433ec09.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')
| -rwxr-xr-x | win/configure | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/win/configure b/win/configure index bad344c..fc453f8 100755 --- a/win/configure +++ b/win/configure @@ -4362,7 +4362,17 @@ if test "$tcl_ok" = "yes"; then if test "$do64bit" = "yes"; then - ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib + if test "$GCC" == "yes"; then + + ZLIB_LIBS=\${ZLIB_DIR}/win64/libz.dll.a + + +else + + ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib + + +fi else |