summaryrefslogtreecommitdiffstats
path: root/base/base.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'base/base.gypi')
-rw-r--r--base/base.gypi14
1 files changed, 4 insertions, 10 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',