diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-30 08:21:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-30 08:21:20 (GMT) |
| commit | 15194461b1ae5479887c7348dfcba4c11a01fe30 (patch) | |
| tree | dadf1f5e1deb95f154ab47ed7137513112c541cd | |
| parent | 5bf4c011e1e583ad9be1bae5a6e38cae7cbb81e7 (diff) | |
| download | tcl-15194461b1ae5479887c7348dfcba4c11a01fe30.zip tcl-15194461b1ae5479887c7348dfcba4c11a01fe30.tar.gz tcl-15194461b1ae5479887c7348dfcba4c11a01fe30.tar.bz2 | |
Cherry-pick part of "msys2-fixes_v001" branch: build/test fixes for msys2
| -rw-r--r-- | tests/env.test | 4 | ||||
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/env.test b/tests/env.test index a7aa162..1824ebc 100644 --- a/tests/env.test +++ b/tests/env.test @@ -84,7 +84,7 @@ set printenvScript [makeFile { foreach name { 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 } { @@ -116,7 +116,7 @@ foreach name [array names env] { if {[string toupper $name] ni { TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH 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 SECURITYSESSIONID LANG WINDIR TERM CONNOMPROGRAMFILES PROGRAMFILES COMMONPROGRAMW6432 PROGRAMW6432 }} { diff --git a/unix/configure b/unix/configure index 1c0c2be..1e48efa 100755 --- a/unix/configure +++ b/unix/configure @@ -6931,7 +6931,7 @@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - CYGWIN_*|MINGW32*) + CYGWIN_*|MINGW32*|MSYS_*) SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" @@ -8853,7 +8853,7 @@ fi case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; + CYGWIN_*|MINGW32*|MSYS_*) ;; IRIX*) ;; NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 4c96316..449d7af 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1247,7 +1247,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" @@ -2060,7 +2060,7 @@ dnl # preprocessing tests use only CPPFLAGS. case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; + CYGWIN_*|MINGW32_*|MSYS_*) ;; IRIX*) ;; NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; |