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

Unified Diff: build/secondary/third_party/nss/BUILD.gn

Issue 1644333002: Fix compilation of //third_party/nss with gn on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/third_party/nss/BUILD.gn
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn
index 7b32a04cbf850f9d902011f12cc2466cc6320b0e..2dc414d716f0fe40016b2ebc2260167522bc1916 100644
--- a/build/secondary/third_party/nss/BUILD.gn
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -474,6 +474,30 @@ if (is_linux) {
]
}
+ config("nss_static_config_private") {
+ if (is_clang) {
+ cflags = [
+ # nss doesn"t explicitly cast between different enum types.
+ "-Wno-conversion",
+
+ # nss passes "const char*" through "void*".
+ "-Wno-incompatible-pointer-types",
+
+ # nss prefers `a && b || c` over `(a && b) || c`.
+ "-Wno-logical-op-parentheses",
+
+ # nss doesn"t use exhaustive switches on enums
+ "-Wno-switch",
+
+ # nss has some `unsigned < 0` checks.
+ "-Wno-tautological-compare",
+
+ # nss-urandom-abort.patch removed the only call to rng_systemFromNoise
+ "-Wno-unused-function",
+ ]
+ }
+ }
+
if (is_win && current_cpu == "x86") {
source_set("nss_static_avx") {
sources = [
@@ -891,6 +915,7 @@ if (is_linux) {
# nss passes "const char*" through "void*".
"//build/config/compiler:no_incompatible_pointer_warnings",
+ ":nss_static_config_private",
]
public_configs = [ ":nss_static_config" ]
@@ -1183,28 +1208,6 @@ if (is_linux) {
]
}
- if (is_clang) {
- cflags += [
- # nss doesn"t explicitly cast between different enum types.
- "-Wno-conversion",
-
- # nss passes "const char*" through "void*".
- "-Wno-incompatible-pointer-types",
-
- # nss prefers `a && b || c` over `(a && b) || c`.
- "-Wno-logical-op-parentheses",
-
- # nss doesn"t use exhaustive switches on enums
- "-Wno-switch",
-
- # nss has some `unsigned < 0` checks.
- "-Wno-tautological-compare",
-
- # nss-urandom-abort.patch removed the only call to rng_systemFromNoise
- "-Wno-unused-function",
- ]
- }
-
public_deps = [
":nspr",
]
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698