diff options
| author | Ben Murdoch <benm@google.com> | 2014-07-20 18:26:46 -0700 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-07-20 18:26:46 -0700 |
| commit | c2a9402712e13e15fcae2b17ec0cbecb816ef52e (patch) | |
| tree | 481884e6fdb9d39ed6065a0069750a490081d773 /openssl.target.darwin-arm64.mk | |
| parent | 56aeae9b065578e56222618886ef0e42488397e2 (diff) | |
| parent | 9e21ded33babccff0488621e3a7261175a289f4b (diff) | |
| download | openssl-c2a9402712e13e15fcae2b17ec0cbecb816ef52e.tar.gz | |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: Id679bcc6d6917ac7d763985319eb580c796ef5c9
Diffstat (limited to 'openssl.target.darwin-arm64.mk')
| -rw-r--r-- | openssl.target.darwin-arm64.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk index 40e0e03..5aec3fe 100644 --- a/openssl.target.darwin-arm64.mk +++ b/openssl.target.darwin-arm64.mk @@ -606,7 +606,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -627,6 +626,7 @@ MY_DEFS_Debug := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -672,6 +672,9 @@ LOCAL_CPPFLAGS_Debug := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wno-deprecated \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor @@ -709,7 +712,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ @@ -728,6 +730,7 @@ MY_DEFS_Release := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -773,6 +776,9 @@ LOCAL_CPPFLAGS_Release := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wno-deprecated \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor |