diff options
| author | mostynb <mostynb@opera.com> | 2016-01-06 13:07:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-06 21:09:01 +0000 |
| commit | c61271cf022bfb412db3e53ce8bbc5d8c2c1a873 (patch) | |
| tree | 3e7e144743ef33245782dd754f67b852e740b63e /build/config | |
| parent | 57f1bd6dc79f0d0f85fd38d9921ce692ec799f1e (diff) | |
| download | chromium_src-c61271cf022bfb412db3e53ce8bbc5d8c2c1a873.zip chromium_src-c61271cf022bfb412db3e53ce8bbc5d8c2c1a873.tar.gz chromium_src-c61271cf022bfb412db3e53ce8bbc5d8c2c1a873.tar.bz2 | |
gn: leave PKG_CONFIG_PATH untouched when not using a sysroot
This makes cross-compilation possible when not using a sysroot.
Review URL: https://codereview.chromium.org/1543483002
Cr-Commit-Position: refs/heads/master@{#367906}
Diffstat (limited to 'build/config')
| -rw-r--r-- | build/config/linux/pkg-config.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/config/linux/pkg-config.py b/build/config/linux/pkg-config.py index b038158..deaeed3 100644 --- a/build/config/linux/pkg-config.py +++ b/build/config/linux/pkg-config.py @@ -44,8 +44,7 @@ def SetConfigPath(options): options on the given command line.""" sysroot = options.sysroot - if not sysroot: - sysroot = "" + assert sysroot # Compute the library path name based on the architecture. arch = options.arch @@ -122,8 +121,8 @@ if options.strip_out != None: for regexp in options.strip_out: strip_out.append(re.compile(regexp)) -SetConfigPath(options) if options.sysroot: + SetConfigPath(options) prefix = GetPkgConfigPrefixToStrip(args) else: prefix = '' |