Index: third_party/cld_2/BUILD.gn |
diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn |
index bede93a63c44008985f7c5c332a99109042f9d37..0244d01f8bff43f7f3cf2034c4600372013368ec 100644 |
--- a/third_party/cld_2/BUILD.gn |
+++ b/third_party/cld_2/BUILD.gn |
@@ -47,11 +47,11 @@ source_set("cld2_data") { |
] |
configs -= [ "//build/config/compiler:chromium_code" ] |
- configs += [ "//build/config/compiler:no_chromium_code" ] |
- |
- if (is_win) { |
- cflags = [ "/wd4267" ] # size_t -> int conversion. |
- } |
+ configs += [ |
+ "//build/config/compiler:no_chromium_code", |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
Dirk Pranke
2015/02/18 21:29:29
and again ... I'll stop mentioning this now, but i
|
+ ] |
} |
# As in the corresponding gyp file, this just builds the core interfaces for |
@@ -65,11 +65,11 @@ source_set("cld_2") { |
] |
configs -= [ "//build/config/compiler:chromium_code" ] |
- configs += [ "//build/config/compiler:no_chromium_code" ] |
- |
- if (is_win) { |
- cflags = [ "/wd4267" ] # size_t -> int conversion. |
- } |
+ configs += [ |
+ "//build/config/compiler:no_chromium_code", |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
+ ] |
} |
source_set("cld2_platform_impl") { |
@@ -93,11 +93,11 @@ static_library("cld2_static") { |
":cld2_data", |
] |
configs -= [ "//build/config/compiler:chromium_code" ] |
- configs += [ "//build/config/compiler:no_chromium_code" ] |
- |
- if (is_win) { |
- cflags = [ "/wd4267" ] # size_t -> int conversion. |
- } |
+ configs += [ |
+ "//build/config/compiler:no_chromium_code", |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
+ ] |
} |
config("cld2_dynamic_mode_config") { |
@@ -114,13 +114,11 @@ static_library("cld2_dynamic") { |
configs -= [ "//build/config/compiler:chromium_code" ] |
configs += [ |
- "//build/config/compiler:no_chromium_code", |
":cld2_dynamic_mode_config", |
+ "//build/config/compiler:no_chromium_code", |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
] |
- |
- if (is_win) { |
- cflags = [ "/wd4267" ] # size_t -> int conversion. |
- } |
} |
# Does not build on Windows. |
@@ -144,12 +142,10 @@ if (!is_win) { |
configs -= [ "//build/config/compiler:chromium_code" ] |
configs += [ |
- "//build/config/compiler:no_chromium_code", |
":cld2_dynamic_mode_config", |
+ "//build/config/compiler:no_chromium_code", |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
] |
- |
- if (is_win) { |
- cflags = [ "/wd4267" ] # size_t -> int conversion. |
- } |
} |
} |