build/linux/system.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: build/linux/system.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: build/linux/system.gyp

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

index a1d6bf0a1bcdca2f442d016b102fd5b6adb6e835..476476ecdfab45c5cf7c0866a1a0029225e4b427 100644

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

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

@@ -4,6 +4,14 @@

{

'variables': {

+ 'conditions': [

+ ['sysroot!=""', {

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

+ }, {

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

+ }],

+ ],

# If any of the linux_link_FOO below are set to 1, then the corresponding

# target will be linked against the FOO library (either dynamically or

# statically, depending on the pkg-config files), as opposed to loading the

« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »