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

Side by Side Diff: build/secondary/third_party/nss/BUILD.gn

Issue 758303002: Revert of clang: Suppress a -Wstring-conversion warnings in nspr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 unified diff | Download patch
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/linux/pkg_config.gni") 5 import("//build/config/linux/pkg_config.gni")
6 6
7 if (is_linux) { 7 if (is_linux) {
8 # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL 8 # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL
9 # library but the system NSS libraries. Non-Linux platforms using NSS use the 9 # library but the system NSS libraries. Non-Linux platforms using NSS use the
10 # hermetic one in //third_party/nss. 10 # hermetic one in //third_party/nss.
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 325
326 if (is_clang) { 326 if (is_clang) {
327 cflags += [ 327 cflags += [
328 # nspr uses a bunch of deprecated functions (NSLinkModule etc) in 328 # nspr uses a bunch of deprecated functions (NSLinkModule etc) in
329 # prlink.c on mac. 329 # prlink.c on mac.
330 "-Wno-deprecated-declarations", 330 "-Wno-deprecated-declarations",
331 # nspr passes "const char*" through "void*". 331 # nspr passes "const char*" through "void*".
332 "-Wno-incompatible-pointer-types", 332 "-Wno-incompatible-pointer-types",
333 # nspr passes "int*" through "unsigned int*". 333 # nspr passes "int*" through "unsigned int*".
334 "-Wno-pointer-sign", 334 "-Wno-pointer-sign",
335
336 "-Wno-incompatible-pointer-types",
337 "-Wno-pointer-sign",
335 ] 338 ]
336
337 # nspr uses assert(!"foo") instead of assert(false && "foo").
338 configs -= [ "//build/config/clang:extra_warnings" ]
339 } 339 }
340 } 340 }
341 341
342 component("nss") { 342 component("nss") {
343 output_name = "crnss" 343 output_name = "crnss"
344 sources = [ 344 sources = [
345 # Ensure at least one object file is produced, so that MSVC does not 345 # Ensure at least one object file is produced, so that MSVC does not
346 # warn when creating the static/shared library. See the note for 346 # warn when creating the static/shared library. See the note for
347 # the "nssckbi" target for why the "nss" target was split as such. 347 # the "nssckbi" target for why the "nss" target was split as such.
348 "nss/lib/nss/nssver.c", 348 "nss/lib/nss/nssver.c",
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 ":nspr", 1209 ":nspr",
1210 "//third_party/sqlite", 1210 "//third_party/sqlite",
1211 ] 1211 ]
1212 1212
1213 if (is_win && cpu_arch == "x86") { 1213 if (is_win && cpu_arch == "x86") {
1214 deps += [ ":nss_static_avx" ] 1214 deps += [ ":nss_static_avx" ]
1215 } 1215 }
1216 } 1216 }
1217 } # Windows/Mac/iOS. 1217 } # Windows/Mac/iOS.
1218 1218
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698