Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 config("ssl_config") { | 5 config("ssl_config") { |
| 6 include_dirs = [ "." ] | 6 include_dirs = [ "." ] |
| 7 | 7 |
| 8 if (is_mac || is_win) { | 8 if (is_mac || is_win) { |
| 9 defines = [ "NSS_PLATFORM_CLIENT_AUTH" ] | 9 defines = [ "NSS_PLATFORM_CLIENT_AUTH" ] |
| 10 } | 10 } |
| 11 | |
| 12 if (is_clang) { | |
| 13 cflags = [ | |
| 14 # There is a broken header guard in /usr/include/nss/secmod.h: | |
| 15 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 | |
| 16 "-Wno-header-guard", | |
| 17 ] | |
| 18 } | |
| 11 } | 19 } |
| 12 | 20 |
| 13 component("libssl") { | 21 component("libssl") { |
| 14 output_name = "crssl" | 22 output_name = "crssl" |
| 15 | 23 |
| 16 sources = [ | 24 sources = [ |
| 17 "authcert.c", | 25 "authcert.c", |
| 18 "cmpcert.c", | 26 "cmpcert.c", |
| 19 "derive.c", | 27 "derive.c", |
| 20 "dtlscon.c", | 28 "dtlscon.c", |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 118 "//third_party/nss:nspr", | 126 "//third_party/nss:nspr", |
| 119 "//third_party/nss:nss", | 127 "//third_party/nss:nss", |
| 120 ] | 128 ] |
| 121 forward_dependent_configs_from = deps | 129 forward_dependent_configs_from = deps |
| 122 } | 130 } |
| 123 | 131 |
| 124 if (is_clang) { | 132 if (is_clang) { |
| 125 cflags += [ | 133 cflags += [ |
| 126 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the | 134 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the |
| 127 # system's cert.h because cert.h isn't in chromium's repo. | 135 # system's cert.h because cert.h isn't in chromium's repo. |
| 128 "-Wno-incompatible-pointer-types", | 136 "-Wno-incompatible-pointer-types", |
|
wtc
2014/09/29 17:50:01
This NSS bug was fixed in NSS 3.12.10. Chromium re
engedy
2014/09/29 18:59:10
Hmm, in my read, all signs point to that it was on
wtc
2014/09/29 19:43:38
I was talking about the -Wno-incompatible-pointer-
engedy
2014/09/30 18:15:29
Ahh, my bad, sorry! I have prepared https://codere
| |
| 129 | 137 |
| 130 # There is a broken header guard in /usr/include/nss/secmod.h: | 138 # There is a broken header guard in /usr/include/nss/secmod.h: |
| 131 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 | 139 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 |
| 132 "-Wno-header-guard", | 140 "-Wno-header-guard", |
|
wtc
2014/09/29 17:35:45
The -Wno-header-guard flag is already added here.
brettw
2014/09/29 17:42:28
We should delete this one. The one above will also
engedy
2014/09/30 18:15:29
Done.
| |
| 133 ] | 141 ] |
| 134 } | 142 } |
| 135 | 143 |
| 136 if (is_debug) { | 144 if (is_debug) { |
| 137 defines += [ "DEBUG" ] | 145 defines += [ "DEBUG" ] |
| 138 } | 146 } |
| 139 } | 147 } |
| OLD | NEW |