summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-12-23 00:12:06 +0200
committerTor Lillqvist <tml@iki.fi>2012-12-23 00:12:06 +0200
commit86c0b5d23af740460107668704949f90ae0cc7b8 (patch)
tree5e60a9e67db5b03d0bc0b552d97507f0dc054b57
parent0699cbf1ab315ac9ba1594a0fa4fe1041cd356fa (diff)
Use CXXFLAGS_CXX11 here, too
Change-Id: I82735e3f09f22763ef48aab18dee867159dbf842
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk11
1 files changed, 2 insertions, 9 deletions
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index bd617e4a31dd..de8c590cad31 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