diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 14 | ||||
| -rw-r--r-- | base/nss_util.cc | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/base/base.gypi b/base/base.gypi index ad41e45..fd9ea54 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -332,14 +332,7 @@ 'sources/': [ ['exclude', '_openbsd\\.cc$'] ], }, ], - [ 'OS == "mac"', { - 'sources!': [ - # TODO(wtc): Remove nss_util.{cc,h} when http://crbug.com/30689 - # is fixed. - 'nss_util.cc', - 'nss_util.h', - ], - }, { # OS != "mac" + [ 'OS != "mac"', { 'sources!': [ 'crypto/cssm_init.cc', 'crypto/cssm_init.h', @@ -453,11 +446,12 @@ ], }, },], - [ 'OS == "win"', { + [ 'OS == "mac" or OS == "win"', { 'dependencies': [ '../third_party/nss/nss.gyp:nss', ], - }, { # OS != "win" + },], + [ 'OS != "win"', { 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], 'sources!': [ 'third_party/purify/pure_api.c', diff --git a/base/nss_util.cc b/base/nss_util.cc index 4e67faf..7043b8d 100644 --- a/base/nss_util.cc +++ b/base/nss_util.cc @@ -21,7 +21,7 @@ // On some platforms, we use NSS for SSL only -- we don't use NSS for crypto // or certificate verification, and we don't use the NSS certificate and key // databases. -#if defined(OS_WIN) +#if defined(OS_MACOSX) || defined(OS_WIN) #define USE_NSS_FOR_SSL_ONLY 1 #endif |