Skip to content

Commit

Permalink
Revert 183957
Browse files Browse the repository at this point in the history
> 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
  • Loading branch information
calvinlo@chromium.org committed Feb 22, 2013
1 parent 48c3fb4 commit 72779f0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,3 @@ Sungmann Cho <sungmann.cho@gmail.com>
Evan Peterson <evan.peterson.ep@gmail.com>
J. Ryan Stinnett <jryans@chromium.org>
Matheus Bratfisch <matheusbrat@gmail.com>
Opera Software ASA <*@opera.com>
8 changes: 1 addition & 7 deletions build/linux/pkg-config-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 72779f0

Please sign in to comment.