Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: third_party/yasm/BUILD.gn

Issue 335973002: Minor Fixes for Windows GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « courgette/BUILD.gn ('k') | tools/gn/secondary/third_party/angle/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/yasm/BUILD.gn
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn
index 1693e3f7a730dfae8357a01ca20a746f8bb1a63f..4ac36d1d2ab5f23611768fa24d5069a95ca707ec 100644
--- a/third_party/yasm/BUILD.gn
+++ b/third_party/yasm/BUILD.gn
@@ -47,7 +47,9 @@ if (current_toolchain == host_toolchain) {
"source/config/$os/libyasm-stdint.h",
]
defines = [ "HAVE_CONFIG_H" ]
- cflags = [ "-std=gnu99" ]
+ if (is_posix) {
+ cflags = [ "-std=gnu99" ]
+ }
}
executable("genmacro") {
@@ -122,7 +124,9 @@ if (current_toolchain == host_toolchain) {
"//build/config/compiler:no_chromium_code" ]
# re2c is missing CLOSEVOP from one switch.
- cflags = [ "-Wno-switch" ]
+ if (is_posix) {
+ cflags = [ "-Wno-switch" ]
+ }
}
executable("yasm") {
@@ -218,9 +222,13 @@ if (current_toolchain == host_toolchain) {
# directory, but the gen_x86_insn.py script does not make this easy.
include_dirs = [ yasm_gen_include_dir ]
- cflags = [ "-ansi", "-pedantic" ]
- if (is_clang) {
- cflags += [ "-Wno-incompatible-pointer-types" ]
+ if (is_win) {
+ cflags = [ "/wd4267" ] # size_t to int conversion.
+ } else {
+ cflags = [ "-ansi", "-pedantic" ]
+ if (is_clang) {
+ cflags += [ "-Wno-incompatible-pointer-types" ]
+ }
}
# TODO(ajwong): This should take most of the generated output as
@@ -230,6 +238,7 @@ if (current_toolchain == host_toolchain) {
":compile_gperf_for_include",
":compile_nasm_macros",
":compile_nasm_version",
+ ":compile_re2c_lc3b",
":compile_win64_gas",
":compile_win64_nasm",
":compile_re2c",
« no previous file with comments | « courgette/BUILD.gn ('k') | tools/gn/secondary/third_party/angle/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698