build/config/linux/pkg-config.py - Issue 549453004: GN: Fix compile errors with os==chromeos mojo/public build

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/config/linux/pkg-config.py

Issue 549453004: GN: Fix compile errors with os==chromeos mojo/public build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@signed

Patch Set: Update description Created 6 years, 3 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/config/linux/pkg-config.py

diff --git a/build/config/linux/pkg-config.py b/build/config/linux/pkg-config.py

index b107e74f2773987b0b12b658e41c9fc1e0fc7868..60304d47f841cefb230b967257e9956a7da63d72 100644

--- a/build/config/linux/pkg-config.py

+++ b/build/config/linux/pkg-config.py

@@ -101,6 +101,8 @@ def RewritePath(path, strip_prefix, sysroot):

parser = OptionParser()

+parser.add_option('-p', action='store', dest='pkg_config', type='string',

+ default='pkg-config')

parser.add_option('-v', action='append', dest='strip_out', type='string')

parser.add_option('-s', action='store', dest='sysroot', type='string')

parser.add_option('-a', action='store', dest='arch', type='string')

@@ -120,7 +122,7 @@ else:

try:

flag_string = subprocess.check_output(

- [ "pkg-config", "--cflags", "--libs-only-l", "--libs-only-L" ] +

+ [ options.pkg_config, "--cflags", "--libs-only-l", "--libs-only-L" ] +

args, env=os.environ)

# For now just split on spaces to get the args out. This will break if

# pkgconfig returns quoted things with spaces in them, but that doesn't seem

« no previous file with comments | « build/config/arm.gni ('k') | build/config/linux/pkg_config.gni » ('j') | no next file with comments »