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

Unified Diff: third_party/zlib/BUILD.gn

Issue 709593004: Make *some* version of the Win GN build work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: turn off tcmalloc altogether Created 6 years, 1 month 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 | « crypto/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/BUILD.gn
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index 18cf816397c05839f3f2d76f981fa95e0ee42a36..5dbec0ff6bf3cad30fdaf8f240a3ba92464ef392 100644
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
@@ -7,11 +7,15 @@ config("zlib_config") {
}
static_library("zlib_x86_simd") {
- if (cpu_arch == "x86" || cpu_arch == "x64") {
+ if (!is_win && (cpu_arch == "x86" || cpu_arch == "x64")) {
Nico 2014/11/18 19:13:43 This isn't correct. The gyp version does use crc_f
Dirk Pranke 2014/11/18 20:37:45 Okay, good to know. I'll try to fix that in a foll
sources = [ "crc_folding.c", "fill_window_sse.c" ]
cflags = [ "-msse2", "-msse4.2", "-mpclmul" ]
} else {
sources = [ "simd_stub.c"]
+ if (is_win) {
+ # TODO(GYP): crbug.com/431462 disable warning about structure padding.
+ cflags = [ "/wd4324" ]
+ }
}
}
@@ -52,7 +56,7 @@ static_library("zlib") {
"zutil.h",
]
- if (cpu_arch == "x86" || cpu_arch == "x64") {
+ if (!is_win && (cpu_arch == "x86" || cpu_arch == "x64")) {
sources += [ "x86.c" ]
}
« no previous file with comments | « crypto/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698