diff options
| author | btolsch <btolsch@chromium.org> | 2019-08-29 13:43:12 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-29 20:51:08 +0000 |
| commit | 8881b49946e2ec2d8fecbd400b3a73e7e80f440b (patch) | |
| tree | 1c4578236ea2d1bde2b6e73a59fc8ef8e70c6c95 /third_party/boringssl | |
| parent | 230920ee65948294155143d1d083f69898015153 (diff) | |
| download | openscreen-8881b49946e2ec2d8fecbd400b3a73e7e80f440b.tar.gz | |
Fix gcc 8.2 errors
This change fixes compilation issues found with gcc 8.2 in preparation
for re-enabling the gcc bots.
Bug: openscreen:40
Change-Id: Ie9233c813fb65d7be57401345fd6a0339ddbdcdd
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1775427
Commit-Queue: Brandon Tolsch <btolsch@chromium.org>
Reviewed-by: Ryan Keane <rwkeane@google.com>
Reviewed-by: Jordan Bayles <jophba@chromium.org>
Reviewed-by: Max Yakimakha <yakimakha@chromium.org>
Diffstat (limited to 'third_party/boringssl')
| -rw-r--r-- | third_party/boringssl/BUILD.gn | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index ff5c2aba..a43fbba9 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -17,7 +17,10 @@ if (build_with_chromium) { # Config for us and everybody else depending on BoringSSL. config("external_config") { include_dirs = [ "src/include" ] - cflags = [ "-Wno-extra-semi" ] + cflags = [] + if (is_clang) { + cflags += [ "-Wno-extra-semi" ] + } } # Config internal to this build file, shared by boringssl and boringssl_fuzzer. @@ -29,12 +32,13 @@ if (build_with_chromium) { "BORINGSSL_NO_STATIC_INITIALIZER", "OPENSSL_SMALL", ] + cflags = [] cflags_c = [ "-std=c99" ] - - cflags = [ - "-Wno-c++98-compat-extra-semi", - "-Wno-extra-semi", - ] + cflags_cc = [] + if (is_clang) { + cflags += [ "-Wno-extra-semi" ] + cflags_cc += [ "-Wno-c++98-compat-extra-semi" ] + } if (is_mac) { # Necessary since trybots have an old version of clang. |