aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-05-31 18:35:52 +0200
committerLukas Larsson <[email protected]>2016-06-14 10:08:28 +0200
commit4f9c3328330df12955a27b455f3763d51f18f4c2 (patch)
tree43f989c51e5877ccb5ce37e5dd9a492b55a58d0e /erts
parent2f3286f7eb10f7460e68cd268651e767e24048ef (diff)
downloadotp-4f9c3328330df12955a27b455f3763d51f18f4c2.tar.gz
otp-4f9c3328330df12955a27b455f3763d51f18f4c2.tar.bz2
otp-4f9c3328330df12955a27b455f3763d51f18f4c2.zip
erl_interface: Fix decode_ulong on windows
Diffstat (limited to 'erts')
-rw-r--r--erts/aclocal.m46
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