diff options
| author | Lukas Larsson <[email protected]> | 2016-06-14 10:08:56 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-06-14 10:08:56 +0200 |
| commit | 64515dcead288dacf4876eb0502c755f08427977 (patch) | |
| tree | 266b5f2ca780c885d00efba6617e0145af0ab99e /erts | |
| parent | 2f3286f7eb10f7460e68cd268651e767e24048ef (diff) | |
| parent | fafacbdb5c3b8852e29da51933b708bbc57e8a0b (diff) | |
| download | otp-64515dcead288dacf4876eb0502c755f08427977.tar.gz otp-64515dcead288dacf4876eb0502c755f08427977.tar.bz2 otp-64515dcead288dacf4876eb0502c755f08427977.zip | |
Merge branch 'lukas/erl_interface/fix_long_windows/OTP-13673'
* lukas/erl_interface/fix_long_windows/OTP-13673:
erl_interface: Fix trace level tracing on windows
erl_interface: Fix decode_ulong on windows
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/aclocal.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 86799186fd..013bfe5652 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -128,13 +128,13 @@ 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/msys-?.0.dll; then - CFLAGS="-O2" + CFLAGS="$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" + CFLAGS="$CFLAGS -O2" MIXED_CYGWIN=yes AC_MSG_RESULT([Cygwin and VC]) MIXED_CYGWIN_VC=yes @@ -162,7 +162,7 @@ if test "x$MIXED_MSYS" != "xyes"; then AC_MSG_CHECKING(for mixed cygwin and native MinGW environment) if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then if test -x /usr/bin/cygpath; then - CFLAGS="-O2" + CFLAGS="$CFLAGS -O2" MIXED_CYGWIN=yes AC_MSG_RESULT([yes]) MIXED_CYGWIN_MINGW=yes |