| Index: third_party/yasm/BUILD.gn
|
| diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn
|
| index cd9b4532e6c8b1f9d052ac12702392d367288006..a09a4959a620f35f0b9f67c0c4a7847351583f9a 100644
|
| --- a/third_party/yasm/BUILD.gn
|
| +++ b/third_party/yasm/BUILD.gn
|
| @@ -30,18 +30,14 @@
|
| if (current_toolchain == host_toolchain) {
|
| # Various files referenced by multiple targets.
|
| yasm_gen_include_dir = "$target_gen_dir/include"
|
| - yasm_os = os
|
| - if (is_chromeos) {
|
| - yasm_os = "linux"
|
| - }
|
| - config_makefile = "source/config/$yasm_os/Makefile"
|
| + config_makefile = "source/config/$host_os/Makefile"
|
| version_file = "version.mac"
|
|
|
| import("//build/compiled_action.gni")
|
|
|
| config("yasm_config") {
|
| include_dirs = [
|
| - "source/config/$yasm_os",
|
| + "source/config/$host_os",
|
| "source/patched-yasm",
|
| ]
|
| defines = [ "HAVE_CONFIG_H" ]
|
| @@ -148,8 +144,6 @@ if (current_toolchain == host_toolchain) {
|
| # re2c is missing CLOSEVOP from one switch.
|
| if (is_posix) {
|
| cflags = [ "-Wno-switch" ]
|
| - } else if (is_win) {
|
| - cflags = [ "/wd4267" ] # size_t to int conversion.
|
| }
|
| }
|
|
|
| @@ -248,9 +242,7 @@ if (current_toolchain == host_toolchain) {
|
| # directory, but the gen_x86_insn.py script does not make this easy.
|
| include_dirs = [ yasm_gen_include_dir ]
|
|
|
| - if (is_win) {
|
| - cflags = [ "/wd4267" ] # size_t to int conversion.
|
| - } else {
|
| + if (!is_win) {
|
| cflags = [
|
| "-ansi",
|
| "-pedantic",
|
|
|