Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 2ea9a943f241b33eb8b08f53c087c5293177f2e9..f30a9698fc23b64609f6385cdd3ef8c535f7f04b 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -728,7 +728,7 @@ |
], |
}, |
], |
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { |
+ [ 'toolkit_uses_gtk == 1', { |
'dependencies': [ |
'../build/linux/system.gyp:gconf', |
'../build/linux/system.gyp:gdk', |
@@ -996,7 +996,7 @@ |
'proxy/proxy_config_service_linux_unittest.cc', |
], |
}], |
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { |
+ [ 'toolkit_uses_gtk == 1', { |
'dependencies': [ |
'../build/linux/system.gyp:gtk', |
'../build/linux/system.gyp:nss', |
@@ -1008,7 +1008,7 @@ |
], |
} |
], |
- [ 'OS == "linux"', { |
+ [ 'os_posix == 1 and OS != "mac"', { |
'conditions': [ |
['linux_use_tcmalloc==1', { |
'dependencies': [ |
@@ -1170,7 +1170,7 @@ |
'../third_party/protobuf/protobuf.gyp:py_proto', |
], |
}], |
- ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { |
+ ['os_posix == 1 and OS != "mac"', { |
'conditions': [ |
['use_openssl==1', { |
'dependencies': [ |
@@ -1183,7 +1183,7 @@ |
}], |
], |
}], |
- ['OS == "linux"', { |
+ ['os_posix == 1 and OS != "mac"', { |
'conditions': [ |
['linux_use_tcmalloc==1', { |
'dependencies': [ |
@@ -1287,7 +1287,7 @@ |
}, |
], |
'conditions': [ |
- ['OS=="linux"', { |
+ ['os_posix == 1 and OS != "mac"', { |
'targets': [ |
{ |
'target_name': 'flip_in_mem_edsm_server', |