net/third_party/nss/ssl.gyp - Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp

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: net/third_party/nss/ssl.gyp

Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 months ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/third_party/nss/ssl.gyp

diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp

index c09f306208e58291b06efa587a29f78bb59db106..1d2bab8c8ebf90187fb255e3c2f3b9fdb41d3859 100644

--- a/net/third_party/nss/ssl.gyp

+++ b/net/third_party/nss/ssl.gyp

@@ -3,6 +3,22 @@

# found in the LICENSE file.

{

+ 'conditions': [

+ [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {

+ 'conditions': [

+ ['sysroot!=""', {

+ 'variables': {

+ 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',

+ },

+ }, {

+ 'variables': {

+ 'pkg-config': 'pkg-config'

+ },

+ }],

+ ],

+ }],

+ ],

'targets': [

{

'target_name': 'libssl',

« no previous file with comments | « media/media.gyp ('k') | third_party/harfbuzz-ng/harfbuzz.gyp » ('j') | no next file with comments »