diff options
| author | sbc <sbc@chromium.org> | 2015-06-03 19:13:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-04 02:13:47 +0000 |
| commit | 3f39737a0258d942440b9abe589f06c7305bfb77 (patch) | |
| tree | f8ef279ae8b50ae5e7f1465d19f66c81630b0ab8 /build/linux/system.gyp | |
| parent | c9febe9f2462a1bd2b2fd5188fd05c88c552220b (diff) | |
| download | chromium_src-3f39737a0258d942440b9abe589f06c7305bfb77.zip chromium_src-3f39737a0258d942440b9abe589f06c7305bfb77.tar.gz chromium_src-3f39737a0258d942440b9abe589f06c7305bfb77.tar.bz2 | |
Speculative revert to fix ChromeOS PFQ mips builder
The original change is suspected of breaking the build
and the second one is followup that needs to be reverted
along with it.
Revert "Fix use of 'sysroot' variable in harfbuzz.gyp"
https://codereview.chromium.org/1158283003
Revert "Fix common.gypi when run with target_arch=mips"
https://codereview.chromium.org/1166523004
TBR=cpu
BUG=496462
Review URL: https://codereview.chromium.org/1159083004
Cr-Commit-Position: refs/heads/master@{#332766}
Diffstat (limited to 'build/linux/system.gyp')
| -rw-r--r-- | build/linux/system.gyp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index a1d6bf0..476476e 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 |