diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 22:54:47 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 22:54:47 +0000 |
| commit | a7e38aca1994911dfa4558d3c1909ced27420ca1 (patch) | |
| tree | 6292044ce715755083158bb8e9509481d6d95767 /build | |
| parent | 624896101d464fa075a49075331dc2281c821d3b (diff) | |
| download | chromium_src-a7e38aca1994911dfa4558d3c1909ced27420ca1.zip chromium_src-a7e38aca1994911dfa4558d3c1909ced27420ca1.tar.gz chromium_src-a7e38aca1994911dfa4558d3c1909ced27420ca1.tar.bz2 | |
Revert 65580 - Fix pkg-config-wrapper to work with chromiumos chroots
Some pkg-config packages in chromium os (e.g. gtk) end up hard-coding libdir to be absolute (rather than relative to prefix), so it breaks builds from outside the chroot.
This works around it.
BUG=none
TEST=build with sysroot=/path/to/chromiumos/chroot/build/x86-generic
Review URL: http://codereview.chromium.org/4516002
TBR=piman@chromium.org
Review URL: http://codereview.chromium.org/4754002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/linux/pkg-config-wrapper | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/linux/pkg-config-wrapper b/build/linux/pkg-config-wrapper index 6ce9e2a..fa76c2e 100755 --- a/build/linux/pkg-config-wrapper +++ b/build/linux/pkg-config-wrapper @@ -11,4 +11,4 @@ rewrite=`dirname $0`/rewrite_dirs.py shift config_path=$root/usr/lib/pkgconfig:$root/usr/share/pkgconfig -PKG_CONFIG_PATH=$config_path pkg-config --define-variable=prefix=/usr --define-variable=libdir=/usr/lib "$@" | $rewrite $root +PKG_CONFIG_PATH=$config_path pkg-config --define-variable=prefix=/usr "$@" | $rewrite $root |