diff options
| author | brettw <brettw@chromium.org> | 2015-09-02 10:57:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-02 17:57:52 +0000 |
| commit | 6dd952c77209619a445205998173fc40fb817be1 (patch) | |
| tree | 19bfb128fb9e34c4be876041cb3e60d88a1a3d6c /third_party/yasm/BUILD.gn | |
| parent | 5698e42ca565654da35056bcf03ee42bbf87fd11 (diff) | |
| download | chromium_src-6dd952c77209619a445205998173fc40fb817be1.zip chromium_src-6dd952c77209619a445205998173fc40fb817be1.tar.gz chromium_src-6dd952c77209619a445205998173fc40fb817be1.tar.bz2 | |
Un-nest configs in GN files.
People sometimes nest targets or configs, usually with the assumption that this limits the visibility of a config to within a target. But this nesting provides no visibility restrictions over declaring it outside of a block.
Un-nest for clarity.
Re-land of http://crrev.com/1318823008 while preserving config ordering.
Review URL: https://codereview.chromium.org/1307223010
Cr-Commit-Position: refs/heads/master@{#346964}
Diffstat (limited to 'third_party/yasm/BUILD.gn')
| -rw-r--r-- | third_party/yasm/BUILD.gn | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index fcb779a..36937b8 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -135,6 +135,20 @@ if (current_toolchain == host_toolchain) { ] } + 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", @@ -148,23 +162,13 @@ if (current_toolchain == host_toolchain) { "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 += [ ":yasm_config", "//build/config/compiler:no_chromium_code", + + # Must be after no_chromium_code for warning flags to be ordered + # correctly. ":re2c_warnings", ] deps = [ @@ -172,6 +176,15 @@ if (current_toolchain == host_toolchain) { ] } + 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", @@ -260,17 +273,11 @@ if (current_toolchain == host_toolchain) { ":yasm_config", "//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" ] + # Must be after no_chromium_code for warning flags to be ordered + # correctly. + ":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. |