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

Jan-Marek Glogowski glogow at fbihome.de
Thu Sep 18 02:48:36 PDT 2014


 solenv/gbuild/platform/com_GCC_defs.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f5496edf47684403ba7463249f76eab94f3da501
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Tue Sep 16 20:51:36 2014 +0200

    Don't use gnu++03 alias of gnu++98 for ODK builds
    
    gnu++03 is just an alias for gnu++98 and was introduced in gcc 4.8.
    This prevents older compilers from building the code.
    
    Change-Id: I7e09338f26376c08c476561cdcddde39c7e62b09
    Reviewed-on: https://gerrit.libreoffice.org/11501
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 9ee1fd2..647aa8b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -99,11 +99,10 @@ gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
 
 # This is the default in non-C++11 mode
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
-# doesn't know gnu++03 and this seems to be the same anyway
 gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \
     -Wno-deprecated-declarations
 else
-gb_CXX03FLAGS := -std=gnu++03 -pedantic-errors -Wno-long-long \
+gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors -Wno-long-long \
     -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations
 endif
 


More information about the Libreoffice-commits mailing list