summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebres <sebres@users.sourceforge.net>2018-07-20 15:54:11 (GMT)
committersebres <sebres@users.sourceforge.net>2018-07-20 15:54:11 (GMT)
commit7fb72851e8562eb2e68ec94d10e1b88fb40b863e (patch)
treea5546297ce0f9e42bf96bd57fdae1f8a62922ea7
parent4a3f32b84a736f51135c5321007ba7c7fa8ed47e (diff)
downloadtcl-7fb72851e8562eb2e68ec94d10e1b88fb40b863e.zip
tcl-7fb72851e8562eb2e68ec94d10e1b88fb40b863e.tar.gz
tcl-7fb72851e8562eb2e68ec94d10e1b88fb40b863e.tar.bz2
win: fixes x64-build within gcc-compile runtime env for (mingw64, etc): "$do64bit" may be "amd64|x64|yes", so it could find & copy wrong zlib.dll.
-rwxr-xr-xwin/configure2
-rw-r--r--win/configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/win/configure b/win/configure
index be38dc3..03ad68a 100755
--- a/win/configure
+++ b/win/configure
@@ -4372,7 +4372,7 @@ if test "$tcl_ok" = "yes"; then
ZLIB_DLL_FILE=\${ZLIB_DLL_FILE}
- if test "$do64bit" = "yes"; then
+ if test "$do64bit" != "no"; then
if test "$GCC" == "yes"; then
diff --git a/win/configure.in b/win/configure.in
index 5fc17a3..82351f1 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -128,7 +128,7 @@ 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"], [
+ AS_IF([test "$do64bit" != "no"], [
AS_IF([test "$GCC" == "yes"],[
AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
], [