aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-11-23 12:48:48 +0100
committerDan Gudmundsson <[email protected]>2015-11-23 12:48:48 +0100
commitab1bf8631008ea62443366125c6932db2e2af69a (patch)
tree428248577b666a0d990720923c1dc9ecad595be7 /erts
parentce2c40a26be94b564a3d7178321e26e81d71ab93 (diff)
parentba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de (diff)
downloadotp-ab1bf8631008ea62443366125c6932db2e2af69a.tar.gz
otp-ab1bf8631008ea62443366125c6932db2e2af69a.tar.bz2
otp-ab1bf8631008ea62443366125c6932db2e2af69a.zip
Merge branch 'maint'
* maint: win32: Fix mixed cygwin and msys configure tests
Diffstat (limited to 'erts')
-rw-r--r--erts/aclocal.m414
-rw-r--r--erts/include/internal/ethread.h3
2 files changed, 9 insertions, 8 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index eb7d0411a7..f6d8f20e4e 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -127,18 +127,18 @@ MIXED_MSYS=no
AC_MSG_CHECKING(for mixed cygwin or msys and native VC++ environment)
if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then
- if test -x /usr/bin/cygpath; then
- CFLAGS="-O2"
- MIXED_CYGWIN=yes
- AC_MSG_RESULT([Cygwin and VC])
- MIXED_CYGWIN_VC=yes
- CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC"
- elif test -x /usr/bin/msysinfo; then
+ if test -x /usr/bin/msys-?.0.dll; then
CFLAGS="-O2"
MIXED_MSYS=yes
AC_MSG_RESULT([MSYS and VC])
MIXED_MSYS_VC=yes
CPPFLAGS="$CPPFLAGS -DERTS_MIXED_MSYS_VC"
+ elif test -x /usr/bin/cygpath; then
+ CFLAGS="-O2"
+ MIXED_CYGWIN=yes
+ AC_MSG_RESULT([Cygwin and VC])
+ MIXED_CYGWIN_VC=yes
+ CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC"
else
AC_MSG_RESULT([undeterminable])
AC_MSG_ERROR(Seems to be mixed windows but not with cygwin, cannot handle this!)
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h
index 899aa4ad3c..4eeb7097f4 100644
--- a/erts/include/internal/ethread.h
+++ b/erts/include/internal/ethread.h
@@ -54,7 +54,8 @@
#endif
#if defined(ETHR_DEBUG) || !defined(ETHR_INLINE) || ETHR_XCHK \
- || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC))
+ || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC)) \
+ || (defined(__GNUC__) && defined(ERTS_MIXED_MSYS_VC))
# undef ETHR_INLINE
# define ETHR_INLINE
# undef ETHR_FORCE_INLINE