diff options
| author | Dan Gudmundsson <[email protected]> | 2015-11-23 12:46:39 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-11-23 12:46:39 +0100 |
| commit | ba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de (patch) | |
| tree | 97a47d463b5110b8e439b434734feb9227f0897f | |
| parent | edc7104f0b07ced272723fc9a74469fe8310f965 (diff) | |
| parent | b179d2bfb775b12e51ceefca9a8bc63dc2260f54 (diff) | |
| download | otp-ba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de.tar.gz otp-ba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de.tar.bz2 otp-ba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de.zip | |
Merge branch 'dgud/erts/fix-mixed-msys-cygwin' into maint
* dgud/erts/fix-mixed-msys-cygwin:
win32: Fix mixed cygwin and msys configure tests
| -rw-r--r-- | erts/aclocal.m4 | 14 | ||||
| -rw-r--r-- | erts/include/internal/ethread.h | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 390d6cfc4d..3d52538933 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -142,18 +142,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 f9c203e97c..8964f95652 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 |