[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/gbuild

[Luboš Luňák]

 configure.ac                           |    4 ----
 solenv/gbuild/platform/com_GCC_defs.mk |    4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 71a9c492b8ac7d9f33a92327d43efcb0e4617243
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Mon Nov 10 12:29:10 2014 +0100

    force --std=gnu89 for clang (and gcc), properly
    
    This implements 3a4860a751980b566b44d57cde188292df5e8726 in the proper place.
    
    Change-Id: I7b60602933819561d0bff5e72dcd5ee8986f63c0

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 1b2ceeb..b6d9735 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -107,6 +107,10 @@ gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors -Wno-long-long \
     -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations
 endif
 
+# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to
+# to catch potential gnu89/C90 incompatibilities locally.
+gb_CFLAGS_COMMON += -std=gnu89
+
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
commit 74a2fb369c9ca7b3b423723926626fb0760abb29
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Mon Nov 10 12:22:01 2014 +0100

    Revert "Force --std=gnu89 for clang."
    
    Explictly passing any CFLAGS to configure overrides (=disables) CFLAGS that
    would be used by default. So if this sets CFLAGS to just --std=gnu89, .c files
    will never be built with optimization or debuginfo.
    
    This reverts commit 3a4860a751980b566b44d57cde188292df5e8726.

diff --git a/configure.ac b/configure.ac
index b1fada1..f47b06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3190,10 +3190,6 @@ if test "$GCC" = "yes"; then
         AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
         AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
     fi
-
-    # On Windows MSVC only supports C90 so force gnu89 (especially in clang) to
-    # to catch potential gnu89/C90 incompatibilities locally.
-    CFLAGS="$CFLAGS -std=gnu89"
 fi
 AC_SUBST(COM_GCC_IS_CLANG)