Index: build/linux/system.gyp |
diff --git a/build/linux/system.gyp b/build/linux/system.gyp |
index c48a08cb068d0db276ae70299092f6332478a23a..d69c3868c6c2bae140feb063e10b37cd791dbc76 100644 |
--- a/build/linux/system.gyp |
+++ b/build/linux/system.gyp |
@@ -14,7 +14,11 @@ |
}, |
}], |
], |
- |
+ |
+ 'variables': { |
+ 'use_system_ssl%': 1, |
+ }, |
+ |
'targets': [ |
{ |
'target_name': 'gtk', |
@@ -61,20 +65,42 @@ |
'type': 'settings', |
'conditions': [ |
['_toolset=="target"', { |
- 'direct_dependent_settings': { |
- 'cflags': [ |
- '<!@(<(pkg-config) --cflags nss)', |
- ], |
- }, |
- 'link_settings': { |
- 'ldflags': [ |
- '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', |
- ], |
- 'libraries': [ |
- '<!@(<(pkg-config) --libs-only-l nss)', |
- ], |
- }, |
- }]] |
+ 'conditions': [ |
+ ['use_system_ssl==0', { |
+ 'dependencies': [ |
+ '../../net/third_party/nss/nss.gyp:ssl', |
+ ], |
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '-Ithird_party/nss/ssl', |
+ '<!@(<(pkg-config) --cflags nss)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', |
+ ], |
+ }, |
+ }, { |
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '<!@(<(pkg-config) --cflags nss)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l nss)', |
+ ], |
+ }, |
+ }]] |
+ }], |
+ ], |
}, |
{ |
'target_name': 'freetype2', |