| Index: build/linux/system.gyp
|
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp
|
| index 9079011122c4f8948cb4db49e790976a52b7649f..eb05a0329fa9201256db9d282c7ed6c02555612f 100644
|
| --- a/build/linux/system.gyp
|
| +++ b/build/linux/system.gyp
|
| @@ -1155,8 +1155,7 @@
|
| 'dependencies': [
|
| '../../third_party/boringssl/boringssl.gyp:boringssl',
|
| ],
|
| - }],
|
| - ['use_openssl==0', {
|
| + }, {
|
| 'dependencies': [
|
| '../../net/third_party/nss/ssl.gyp:libssl',
|
| ],
|
| @@ -1166,6 +1165,13 @@
|
| # before other includes, as we are shadowing system headers.
|
| '<(DEPTH)/net/third_party/nss/ssl',
|
| ],
|
| + },
|
| + }],
|
| + # Link in the system NSS if it is used for either the internal
|
| + # crypto library (use_openssl==0) or platform certificate
|
| + # library (use_nss==1).
|
| + ['use_openssl==0 or use_nss==1', {
|
| + 'direct_dependent_settings': {
|
| 'cflags': [
|
| '<!@(<(pkg-config) --cflags nss)',
|
| ],
|
| @@ -1178,15 +1184,17 @@
|
| '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
|
| ],
|
| },
|
| - }],
|
| - ['use_openssl==0 and clang==1', {
|
| - 'direct_dependent_settings': {
|
| - 'cflags': [
|
| - # There is a broken header guard in /usr/include/nss/secmod.h:
|
| - # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
|
| - '-Wno-header-guard',
|
| - ],
|
| - },
|
| + 'conditions': [
|
| + ['clang==1', {
|
| + 'direct_dependent_settings': {
|
| + 'cflags': [
|
| + # There is a broken header guard in /usr/include/nss/secmod.h:
|
| + # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
|
| + '-Wno-header-guard',
|
| + ],
|
| + },
|
| + }],
|
| + ],
|
| }],
|
| ]
|
| }],
|
|
|