[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/platform/IOS_ARM_GCC.mk |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 86c0b5d23af740460107668704949f90ae0cc7b8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Dec 23 00:12:06 2012 +0200

    Use CXXFLAGS_CXX11 here, too
    
    Change-Id: I82735e3f09f22763ef48aab18dee867159dbf842

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index bd617e4..de8c590 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -62,15 +62,8 @@ gb_CXXFLAGS := \
 	-Wno-ctor-dtor-privacy \
 	-Wno-non-virtual-dtor \
 	-fno-strict-aliasing \
-	-fsigned-char
-
-# No idea if -malign-natural is needed, but macosx.mk uses it...
-# Why it isn't used in gb_CFLAGS I have no idea.
-# Anyway, Clang doesn't have this option.
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
-gb_CXXFLAGS += \
-	-malign-natural
-endif
+	-fsigned-char \
+	$(CXXFLAGS_CXX11) \
 
 # these are to get gcc to switch to Objective-C++ or Objective-C mode
 gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300