diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-30 08:31:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-30 08:31:29 (GMT) |
| commit | 4ba63aa46ac67d6cb1657ab8bbf4ca660dbf3cb6 (patch) | |
| tree | c640c79a803b6f3e5b19362c7538a1b2a094a042 | |
| parent | 750dd56fe0b26b8495c8c9450af24c5cd4d2d5d7 (diff) | |
| parent | 15194461b1ae5479887c7348dfcba4c11a01fe30 (diff) | |
| download | tcl-4ba63aa46ac67d6cb1657ab8bbf4ca660dbf3cb6.zip tcl-4ba63aa46ac67d6cb1657ab8bbf4ca660dbf3cb6.tar.gz tcl-4ba63aa46ac67d6cb1657ab8bbf4ca660dbf3cb6.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | tests/env.test | 2 | ||||
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/env.test b/tests/env.test index 8cc57d2..036c7a2 100644 --- a/tests/env.test +++ b/tests/env.test @@ -100,7 +100,7 @@ proc cleanup1 {} { variable keep { TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH - DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING + DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING MSYSTEM __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM CommonProgramFiles ProgramFiles CommonProgramW6432 ProgramW6432 } diff --git a/unix/configure b/unix/configure index 9dd612d..d452bd3 100755 --- a/unix/configure +++ b/unix/configure @@ -6787,7 +6787,7 @@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - CYGWIN_*|MINGW32*) + CYGWIN_*|MINGW32*|MSYS_*) SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" @@ -8713,7 +8713,7 @@ fi case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*) ;; + CYGWIN_*|MINGW32*|MSYS_*) ;; IRIX*) ;; NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 51ac8d9..504826b 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1189,7 +1189,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - CYGWIN_*|MINGW32*) + CYGWIN_*|MINGW32*|MSYS_*) SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" @@ -1986,7 +1986,7 @@ dnl # preprocessing tests use only CPPFLAGS. case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*) ;; + CYGWIN_*|MINGW32_*|MSYS_*) ;; IRIX*) ;; NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; |