From bb52b5e452887d4b1bd93d411ca26ab01ae7eb37 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Wed, 26 Aug 2020 00:54:50 -0400 Subject: [PATCH] Suppress two override suggestion warnings. We're turning these on in ANGLE and want to keep the build clean. --- BUILD.gn | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9525b5d2..9a6c1bc2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -59,13 +59,13 @@ action("glslang_build_info") { script, template_file, ] - outputs = [ - out_file - ] + outputs = [ out_file ] args = [ rebase_path(src_dir, root_build_dir), - "-i", rebase_path(template_file, root_build_dir), - "-o", rebase_path(out_file, root_build_dir), + "-i", + rebase_path(template_file, root_build_dir), + "-o", + rebase_path(out_file, root_build_dir), ] } @@ -228,10 +228,12 @@ template("glslang_sources_common") { "-Wno-ignored-qualifiers", "-Wno-implicit-fallthrough", "-Wno-inconsistent-missing-override", - "-Wno-sign-compare", - "-Wno-unused-variable", "-Wno-missing-field-initializers", "-Wno-newline-eof", + "-Wno-sign-compare", + "-Wno-suggest-destructor-override", + "-Wno-suggest-override", + "-Wno-unused-variable", ] } if (is_win && !is_clang) { @@ -291,9 +293,9 @@ executable("glslang_validator") { } defines = [ "ENABLE_OPT=1" ] deps = [ + ":glslang_build_info", ":glslang_default_resource_limits_sources", ":glslang_sources", - ":glslang_build_info", ] public_configs = [ ":glslang_hlsl" ]