summaryrefslogtreecommitdiffstats
path: root/win/configure
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-12 12:24:23 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-12 12:24:23 (GMT)
commitcd31de89b083f0dc02aee63895b89d45e6c1ffb9 (patch)
treef284c460e00d91f4d010977ef6db1a3c61fa0ebf /win/configure
parent348739729adc3e690c33831fd8acc535af539dd8 (diff)
downloadtcl-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')
-rwxr-xr-xwin/configure12
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