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/Makefile.in | |
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/Makefile.in')
-rw-r--r-- | win/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 18993fe..47f3fdd 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -458,7 +458,7 @@ ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE} # use pre-built zlib1.dll ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE} - @if test "@ZLIB_LIBS@set" == "${ZLIB_DIR}/win64/zdll.libset" ; then \ + @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset" ; then \ $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ else \ $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ |