Revert of Un-nest configs in GN files.

third_party/yasm/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # The yasm build process creates a slew of small C subprograms that
 # dynamically generate files at various point in the build process.  This makes
 # the build integration moderately complex.
 #
 # There are three classes of dynamically generated files:
 #   1) C source files that should be included in the build (eg., lc3bid.c)
@@ skipping 117 matching lines @@
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       ":yasm_config",
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
       "//build/config/sanitizers:deps",
     ]
   }
 
-  config("re2c_warnings") {
-    # re2c is missing CLOSEVOP from one switch.
-    if (is_clang) {
-      cflags = [
-        # re2c is missing CLOSEVOP from one switch.
-        "-Wno-switch",
-
-        # re2c contains many static functions in headers (because it's
-        # a C library predating C99.)
-        "-Wno-unused-function",
-      ]
-    }
-  }
-
   executable("re2c") {
     sources = [
       "source/patched-yasm/tools/re2c/actions.c",
       "source/patched-yasm/tools/re2c/code.c",
       "source/patched-yasm/tools/re2c/dfa.c",
       "source/patched-yasm/tools/re2c/main.c",
       "source/patched-yasm/tools/re2c/mbo_getopt.c",
       "source/patched-yasm/tools/re2c/parser.c",
       "source/patched-yasm/tools/re2c/scanner.c",
       "source/patched-yasm/tools/re2c/substr.c",
       "source/patched-yasm/tools/re2c/translate.c",
     ]
 
+    config("re2c_warnings") {
+      # re2c is missing CLOSEVOP from one switch.
+      if (is_clang) {
+        cflags = [
+          # re2c is missing CLOSEVOP from one switch.
+          "-Wno-switch",
+
+          # re2c contains many static functions in headers (because it's
+          # a C library predating C99.)
+          "-Wno-unused-function",
+        ]
+      }
+    }
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
-      ":re2c_warnings",
       ":yasm_config",
       "//build/config/compiler:no_chromium_code",
+      ":re2c_warnings",
     ]
     deps = [
       "//build/config/sanitizers:deps",
     ]
   }
 
-  config("yasm_warnings") {
-    if (is_clang) {
-      cflags = [
-        # reg3264type in x86expr.c is unused.
-        "-Wno-unused-local-typedef",
-      ]
-    }
-  }
-
   executable("yasm") {
     sources = [
       "source/patched-yasm/frontends/yasm/yasm-options.c",
       "source/patched-yasm/frontends/yasm/yasm.c",
       "source/patched-yasm/libyasm/assocdat.c",
       "source/patched-yasm/libyasm/bc-align.c",
       "source/patched-yasm/libyasm/bc-data.c",
       "source/patched-yasm/libyasm/bc-incbin.c",
       "source/patched-yasm/libyasm/bc-org.c",
       "source/patched-yasm/libyasm/bc-reserve.c",
@@ skipping 66 matching lines @@
       # File generated by compile_re2c_lc3b
       "$target_gen_dir/lc3bid.c",
 
       # File generated by generate_module
       "$target_gen_dir/module.c",
     ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       ":yasm_config",
-      ":yasm_warnings",
       "//build/config/compiler:no_chromium_code",
       "//build/config/compiler:no_incompatible_pointer_warnings",
     ]
 
+    config("yasm_warnings") {
+      if (is_clang) {
+        cflags = [
+          # reg3264type in x86expr.c is unused.
+          "-Wno-unused-local-typedef",
+        ]
+      }
+    }
+    configs += [ ":yasm_warnings" ]
+
     # Yasm generates a bunch of .c files which its source file #include.
     # Add the |target_gen_dir| into the include path so it can find them.
     # Ideally, these generated .c files would be placed into a separate
     # directory, but the gen_x86_insn.py script does not make this easy.
     include_dirs = [ yasm_gen_include_dir ]
 
     if (!is_win) {
       cflags = [
         "-ansi",
         "-pedantic",
@@ skipping 212 matching lines @@
 
     # Output eventually #included by source/patched-yasm/frontends/yasm/x86id.c
     outputs = [
       "$yasm_gen_include_dir/x86insns.c",
       "$yasm_gen_include_dir/x86insn_gas.gperf",
       "$yasm_gen_include_dir/x86insn_nasm.gperf",
     ]
     args = [ rebase_path(yasm_gen_include_dir, root_build_dir) ]
   }
 }