diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-08-28 19:48:52 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-08-28 19:48:52 +0000 |
| commit | 6f07e480e38353d842548c43b980dd90e10ee80f (patch) | |
| tree | dab4c1c0ad3ed014ef9036cadc77d799a669ad4e /icui18n.host.darwin-arm64.mk | |
| parent | 139220650762d07d3342feda5256912f954ec604 (diff) | |
| download | icu-6f07e480e38353d842548c43b980dd90e10ee80f.tar.gz | |
Update makefiles after merge of Chromium at e5f75e0d602b
This commit was generated by merge_from_chromium.py.
Change-Id: I277c43d571abaa40bab7afe9c8fdf0899aeb623c
Diffstat (limited to 'icui18n.host.darwin-arm64.mk')
| -rw-r--r-- | icui18n.host.darwin-arm64.mk | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/icui18n.host.darwin-arm64.mk b/icui18n.host.darwin-arm64.mk index d5d1b17..190e7f2 100644 --- a/icui18n.host.darwin-arm64.mk +++ b/icui18n.host.darwin-arm64.mk @@ -204,6 +204,17 @@ MY_CFLAGS_Debug := \ -fno-builtin-sin \ -Wno-format \ -m64 \ + -Wheader-hygiene \ + -Wno-char-subscripts \ + -Wno-unneeded-internal-declaration \ + -Wno-covered-switch-default \ + -Wstring-conversion \ + -Wno-c++11-narrowing \ + -Wno-deprecated-register \ + -Wno-deprecated-declarations \ + -Wno-logical-op-parentheses \ + -Wno-tautological-compare \ + -Wno-return-type-c-linkage \ -Os \ -g \ -fdata-sections \ @@ -258,7 +269,8 @@ LOCAL_CPPFLAGS_Debug := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -frtti \ - -Wno-deprecated + -Wno-deprecated \ + -std=gnu++11 # Flags passed to both C and C++ files. @@ -277,6 +289,17 @@ MY_CFLAGS_Release := \ -fno-builtin-sin \ -Wno-format \ -m64 \ + -Wheader-hygiene \ + -Wno-char-subscripts \ + -Wno-unneeded-internal-declaration \ + -Wno-covered-switch-default \ + -Wstring-conversion \ + -Wno-c++11-narrowing \ + -Wno-deprecated-register \ + -Wno-deprecated-declarations \ + -Wno-logical-op-parentheses \ + -Wno-tautological-compare \ + -Wno-return-type-c-linkage \ -Os \ -fno-ident \ -fdata-sections \ @@ -331,7 +354,8 @@ LOCAL_CPPFLAGS_Release := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -frtti \ - -Wno-deprecated + -Wno-deprecated \ + -std=gnu++11 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) |