diff options
| author | thakis <thakis@chromium.org> | 2015-11-12 16:29:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 00:30:39 +0000 |
| commit | ff2eab9cdcec1613832a42a67c37ab10f7a47922 (patch) | |
| tree | 27670811396a264b95133d16ee686582cb32c472 /content | |
| parent | 5aa461d1cbf2985040d19d40edd78223cfeba2b2 (diff) | |
| download | chromium_src-ff2eab9cdcec1613832a42a67c37ab10f7a47922.zip chromium_src-ff2eab9cdcec1613832a42a67c37ab10f7a47922.tar.gz chromium_src-ff2eab9cdcec1613832a42a67c37ab10f7a47922.tar.bz2 | |
mac/gn: Fix build with 10.11 SDK.
I tried to add -Wno-nonnull to gn in https://codereview.chromium.org/1408433002,
but I (again) stumbled on gn ordering warning flags somewhat surprisingly.
BUG=554955
TBR=brettw
Review URL: https://codereview.chromium.org/1438333002
Cr-Commit-Position: refs/heads/master@{#359450}
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/BUILD.gn | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 275499d..4ca6980 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -21,6 +21,13 @@ declare_args() { content_shell_version = "19.77.34.5" } +config("content_shell_lib_warnings") { + if (is_clang) { + # TODO(thakis): Remove this once http://crbug.com/383820 is figured out + cflags = [ "-Wno-nonnull" ] + } +} + static_library("content_shell_lib") { testonly = true sources = [ @@ -171,17 +178,13 @@ static_library("content_shell_lib") { ] configs += [ + ":content_shell_lib_warnings", "//build/config:precompiled_headers", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. "//build/config/compiler:no_size_t_to_int_warning", ] - if (is_clang) { - # TODO(thakis): Remove this once http://crbug.com/383820 is figured out - cflags = [ "-Wno-nonnull" ] - } - defines = [ "CONTENT_SHELL_VERSION=\"$content_shell_version\"" ] public_deps = [ |