Index: net/net.gyp |
=================================================================== |
--- net/net.gyp (revision 25977) |
+++ net/net.gyp (working copy) |
@@ -375,7 +375,7 @@ |
'../v8/tools/gyp/v8.gyp:v8', |
], |
}], |
- [ 'OS == "linux"', { |
+ [ 'OS == "linux" or OS == "freebsd"', { |
'dependencies': [ |
'../build/linux/system.gyp:gconf', |
'../build/linux/system.gyp:gdk', |
@@ -402,10 +402,10 @@ |
], |
}, |
], |
- [ 'OS == "linux"', { |
+ [ 'OS == "linux" or OS == "freebsd"', { |
'sources/': [ ['exclude', '_(mac|win)\\.cc$'] ], |
}, |
- { # else: OS != "linux" |
+ { # else: OS != "linux" and OS != "freebsd" |
'sources!': [ |
'base/nss_memio.c', |
'base/nss_memio.h', |
@@ -422,6 +422,10 @@ |
], |
}, |
], |
+ [ 'OS == "freebsd"', { |
+ 'sources!': [ 'proxy/proxy_config_service_linux.cc' ], |
+ }, |
+ ], |
[ 'OS == "mac"', { |
'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ], |
'link_settings': { |
@@ -541,7 +545,7 @@ |
], |
}, |
], |
- [ 'OS == "linux"', { |
+ [ 'OS == "linux" or OS == "freebsd"', { |
'sources/': [ ['exclude', '_(mac|win)_unittest\\.cc$'] ], |
'dependencies': [ |
'../build/linux/system.gyp:gtk', |