aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-11-16 16:20:34 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-16 16:20:34 -0800
commit1e5cbf2af7c1b818ba98e8a9da351aecfee320cb (patch)
tree7cbc6aa6a583e7a1ff6500ca30e56067bbb2e8d4 /gyp
parent14102ca4cf0c1053b3cb26733723595d0e6f1f95 (diff)
update iOS build flags
This makes it match OS X build more closely. The most important change is that CLANG_CXX_LIBRARY sets -stdlib=libc++ for both the compiler and the linker. BUG=skia: Review URL: https://codereview.chromium.org/1451913002
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_conditions.gypi17
1 files changed, 10 insertions, 7 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 275e137c93..eb9a6f3243 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -557,13 +557,16 @@
'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
'SDKROOT': 'iphoneos',
'TARGETED_DEVICE_FAMILY': '1,2',
- 'OTHER_CPLUSPLUSFLAGS': [
- '-std=c++0x',
- '-stdlib=libc++',
- '-fvisibility=hidden',
- '-fvisibility-inlines-hidden',
- ],
- 'GCC_THUMB_SUPPORT': 'NO',
+
+ 'CLANG_CXX_LIBRARY': 'libc++',
+ 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
+ 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
+ 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
+ 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
+ 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hidden
+ 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-inlines-hidden
+
+ 'GCC_THUMB_SUPPORT': 'NO', # TODO(mtklein): why would we not want thumb?
},
},
],