diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 00:40:12 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 00:40:12 +0000 |
| commit | 7e52ed73dfdf67c9abee365e5fc95bbc65dd1167 (patch) | |
| tree | a23e39e11956ad8276cd5e0a7d7aa8ae39d3e582 /build | |
| parent | 3697e9d56b2fc863506524c4515aa380335755d6 (diff) | |
| download | chromium_src-7e52ed73dfdf67c9abee365e5fc95bbc65dd1167.zip chromium_src-7e52ed73dfdf67c9abee365e5fc95bbc65dd1167.tar.gz chromium_src-7e52ed73dfdf67c9abee365e5fc95bbc65dd1167.tar.bz2 | |
Linux: enable building with a local version of libssl.
http://codereview.chromium.org/394003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 1 | ||||
| -rw-r--r-- | build/linux/system.gyp | 56 |
2 files changed, 42 insertions, 15 deletions
diff --git a/build/all.gyp b/build/all.gyp index 0a386ea..0fc8293 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -78,6 +78,7 @@ '../sandbox/sandbox.gyp:*', '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', '../tools/xdisplaycheck/xdisplaycheck.gyp:*', + '../net/third_party/nss/nss.gyp:*', ], 'conditions': [ ['branding=="Chrome"', { diff --git a/build/linux/system.gyp b/build/linux/system.gyp index c48a08c..09e420a 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': [ + '-Inet/third_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', |