diff options
| author | thestig <thestig@chromium.org> | 2015-02-11 18:04:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 02:04:44 +0000 |
| commit | e86588abd0f3b65777d8bc679747eeb6bbdf21f8 (patch) | |
| tree | fe8644c52b7e2979933f45b9978a7d376ddd355a /third_party/libphonenumber | |
| parent | d1248009c6eb012b7dac87cef66a30e5d4da5375 (diff) | |
| download | chromium_src-e86588abd0f3b65777d8bc679747eeb6bbdf21f8.zip chromium_src-e86588abd0f3b65777d8bc679747eeb6bbdf21f8.tar.gz chromium_src-e86588abd0f3b65777d8bc679747eeb6bbdf21f8.tar.bz2 | |
Linux: Enable ODR violation detection.
BUG=449754
Review URL: https://codereview.chromium.org/899403003
Cr-Commit-Position: refs/heads/master@{#315906}
Diffstat (limited to 'third_party/libphonenumber')
| -rw-r--r-- | third_party/libphonenumber/BUILD.gn | 5 | ||||
| -rw-r--r-- | third_party/libphonenumber/libphonenumber.gyp | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/third_party/libphonenumber/BUILD.gn b/third_party/libphonenumber/BUILD.gn index 4c32084..a428292 100644 --- a/third_party/libphonenumber/BUILD.gn +++ b/third_party/libphonenumber/BUILD.gn @@ -45,8 +45,9 @@ static_library("libphonenumber_without_metadata") { "src/phonenumbers/utf/unilib.cc", ] - # TODO(scottmg): Temporary until https://codereview.appspot.com/134650043/ - # lands and rolls. http://crbug.com/335824 + # libphonenumber's base/logging.h is a minimal implementation where DCHECKs + # do not consume their arguments. This leads to unused variable warnings in + # release builds. configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] diff --git a/third_party/libphonenumber/libphonenumber.gyp b/third_party/libphonenumber/libphonenumber.gyp index 229440b..f5a98fe 100644 --- a/third_party/libphonenumber/libphonenumber.gyp +++ b/third_party/libphonenumber/libphonenumber.gyp @@ -140,6 +140,12 @@ '/wo4309', ], }], + # libphonenumber needs to fix their ODR violations. http://crbug.com/456021 + ['OS=="linux"', { + 'ldflags!': [ + '-Wl,--detect-odr-violations', + ], + }], ], }] } |