configure.ac | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
New commits:
commit b97a0e941937ad38f5a20d0ab7cea4812fb2fcae
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Dec 14 11:49:46 2016 +0200
really disable -Og on clang
Change-Id: If65cbe691d427a68985de0f8b4c0f9ada7ab281f
diff --git a/configure.ac b/configure.ac
index 29a30d0..38a98dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3790,18 +3790,20 @@ if test "$GCC" = "yes"; then
AC_MSG_RESULT([no])
fi
- AC_MSG_CHECKING([whether $CC supports -Og])
- # Note that clang-3.1 reports a real error for this option
- # so we do not need a special case for clang<=3.1 as above.
- save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -Werror -Og"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_OG=TRUE
],[])
- CFLAGS=$save_CFLAGS
# clang as of version 4.0.0 (trunk 289424) doesn't do this very well
(missing locals, bad param info in stack frame)
- if test "$HAVE_GCC_OG" = "TRUE" -a "$COM_IS_CLANG" != "TRUE"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
+ if "$COM_IS_CLANG" != "TRUE"; then
+ AC_MSG_CHECKING([whether $CC supports -Og])
+ # Note that clang-3.1 reports a real error for this option
+ # so we do not need a special case for clang<=3.1 as above.
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Werror -Og"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_OG=TRUE ],[])
+ CFLAGS=$save_CFLAGS
+ if test "$HAVE_GCC_OG" = "TRUE"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
fi
fi
AC_SUBST(HAVE_GCC_GGDB2)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
