diff options
| author | calvinlo@chromium.org <calvinlo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 03:57:43 +0000 |
|---|---|---|
| committer | calvinlo@chromium.org <calvinlo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 03:57:43 +0000 |
| commit | 72779f09ad90affcadbdc28df18efba50f253bd0 (patch) | |
| tree | 8cabe317b1a15624a842d0e36e45f19605b56c79 /build | |
| parent | 48c3fb43e7c08f68283204d697a63ebc970468a9 (diff) | |
| download | chromium_src-72779f09ad90affcadbdc28df18efba50f253bd0.zip chromium_src-72779f09ad90affcadbdc28df18efba50f253bd0.tar.gz chromium_src-72779f09ad90affcadbdc28df18efba50f253bd0.tar.bz2 | |
Revert 183957
> pkg-config-wrapper shouldn't clobber PKG_CONFIG_PATH if it is already set
>
> This allows cross-compilation using sysroots with pkgconfig directories in
> non-standard locations.
>
> Add Opera Software to the AUTHORS file
>
>
> BUG=
>
>
> Review URL: https://chromiumcodereview.appspot.com/12320047
TBR=mostynb@opera.com
Review URL: https://codereview.chromium.org/12317063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/linux/pkg-config-wrapper | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/build/linux/pkg-config-wrapper b/build/linux/pkg-config-wrapper index 385ac29..c39e5cd 100755 --- a/build/linux/pkg-config-wrapper +++ b/build/linux/pkg-config-wrapper @@ -33,13 +33,7 @@ fi rewrite=`dirname $0`/rewrite_dirs.py package=${!#} -if [ -z "$PKG_CONFIG_PATH" ] -then - config_path=$root/usr/$libpath/pkgconfig:$root/usr/share/pkgconfig -else - config_path="$PKG_CONFIG_PATH" -fi - +config_path=$root/usr/$libpath/pkgconfig:$root/usr/share/pkgconfig set -e # Some sysroots, like the Chromium OS ones, may generate paths that are not # relative to the sysroot. For example, |