build/linux/system.gyp - Issue 486012: Make sure the 'use_system_*' variables are actually visible in the relevant gyp files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/linux/system.gyp

Issue 486012: Make sure the 'use_system_*' variables are actually visible in the relevant gyp files. (Closed)

Patch Set: add new dev dep Created 11 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/linux/system.gyp

diff --git a/build/linux/system.gyp b/build/linux/system.gyp

index a707343c58b0ad8058cdd79864bdafc4cb38cbe1..c51d0a7ab63ae214da0f2ab7109cabd1668fcce1 100644

--- a/build/linux/system.gyp

+++ b/build/linux/system.gyp

@@ -13,11 +13,19 @@

'pkg-config': 'pkg-config'

}],

+ [ 'OS=="linux"', {

+ 'variables': {

+ # We use our own copy of libssl, although we still need to link against

+ # the rest of NSS.

+ 'use_system_ssl%': 0,

+ },

+ }, { # OS!="linux"

+ 'variables': {

+ 'use_system_ssl%': 1,

+ },

+ }],

- 'variables': {

- 'use_system_ssl%': 1,

- },

'targets': [

{

« no previous file with comments | « build/install-build-deps.sh ('k') | third_party/bzip2/bzip2.gyp » ('j') | no next file with comments »