diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-01 01:12:58 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-01 01:26:20 +0200 |
| commit | 7a0b721462182c3a4029c586f90d13eda674eac9 (patch) | |
| tree | b4aeac3a54c0b94255a7df68df97977b8a6c7bd6 /solenv | |
| parent | fead7eb86f0e7e095f873f20bd6812a5bded0e74 (diff) | |
Filter out options that Clang doesn't have
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 15 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 9 |
2 files changed, 17 insertions, 7 deletions
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 5c8dde650d78..03bae7b54b01 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -64,11 +64,15 @@ gb_CXXFLAGS := \ -Wno-ctor-dtor-privacy \ -Wno-non-virtual-dtor \ -fno-strict-aliasing \ - -fsigned-char \ - -malign-natural \ - #-Wshadow \ break in compiler headers already - #-fsigned-char \ might be removed? - #-malign-natural \ might be removed? + -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. +ifeq (,$(findstring /clang,$(CXX))) +gb_CXXFLAGS += \ + -malign-natural +endif # 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 @@ -203,6 +207,7 @@ gb_Library__FRAMEWORKS := \ Foundation \ CoreFoundation \ CoreGraphics \ + CoreText \ gb_Library_PLAINLIBS_NONE += \ objc \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index fb032add0a71..b6aff7fdefc6 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -118,8 +118,13 @@ endif gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ - -fexceptions \ - -fno-enforce-eh-specs \ + -fexceptions + +# Clang doesn't have this option +ifeq (,$(findstring /clang,$(CXX))) +gb_LinkTarget_EXCEPTIONFLAGS += \ + -fno-enforce-eh-specs +endif gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ |