diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:17:33 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:17:33 +0000 |
| commit | 09380295ba73501a205346becac22c6978e4671d (patch) | |
| tree | bf350df1320896ac8d4646f4e62473422d27376d /Source/devtools/devtools_html.target.darwin-arm.mk | |
| parent | 5724c7df915eb741361b685fc719dd5643e4cc0b (diff) | |
| download | WebKit-09380295ba73501a205346becac22c6978e4671d.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I8ca36eee41eba7e9a56d6728a9d19e5883d7058c
Diffstat (limited to 'Source/devtools/devtools_html.target.darwin-arm.mk')
| -rw-r--r-- | Source/devtools/devtools_html.target.darwin-arm.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/devtools/devtools_html.target.darwin-arm.mk b/Source/devtools/devtools_html.target.darwin-arm.mk index 08998287f..e28ca8227 100644 --- a/Source/devtools/devtools_html.target.darwin-arm.mk +++ b/Source/devtools/devtools_html.target.darwin-arm.mk @@ -63,6 +63,7 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ @@ -71,10 +72,10 @@ MY_CFLAGS_Debug := \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections + -ffunction-sections \ + -funwind-tables MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -85,7 +86,6 @@ MY_DEFS_Debug := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -115,7 +115,6 @@ LOCAL_CPPFLAGS_Debug := \ -fvisibility-inlines-hidden \ -Wno-deprecated \ -Wno-abi \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor @@ -147,6 +146,7 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ @@ -155,10 +155,10 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer + -fomit-frame-pointer \ + -funwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -169,7 +169,6 @@ MY_DEFS_Release := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -199,7 +198,6 @@ LOCAL_CPPFLAGS_Release := \ -fvisibility-inlines-hidden \ -Wno-deprecated \ -Wno-abi \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor |