Skip to content

Commit

Permalink
Fix crypto and net build on Windows GN.
Browse files Browse the repository at this point in the history
Review URL: https://codereview.chromium.org/732613003

Cr-Commit-Position: refs/heads/master@{#304233}
  • Loading branch information
jam authored and Commit bot committed Nov 14, 2014
1 parent 344eaad commit bc6cc8e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
5 changes: 5 additions & 0 deletions crypto/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ component("crypto") {
deps += [ "//third_party/android_tools:cpu_features" ]
}

if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ]
}

if (use_openssl) {
# Remove NSS files when using OpenSSL
sources -= [
Expand Down
5 changes: 4 additions & 1 deletion net/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,10 @@ static_library("http_server") {
"server/web_socket.cc",
"server/web_socket.h",
]
configs += [ "//build/config/compiler:wexit_time_destructors" ]
configs += [
"//build/config/compiler:wexit_time_destructors",
":net_win_size_truncation"
]
deps = [
":net",
"//base",
Expand Down

0 comments on commit bc6cc8e

Please sign in to comment.