Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Unified Diff: build/linux/pkg-config-wrapper

Issue 12318018: don't clobber PKG_CONFIG_PATH, allow cross-compilation without a sysroot (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/pkg-config-wrapper
diff --git a/build/linux/pkg-config-wrapper b/build/linux/pkg-config-wrapper
index c39e5cd3f38c3a02d5b080e8590d2d17ac30b22c..385ac29ce96cb5b27d209490efcfb44d781148b5 100755
--- a/build/linux/pkg-config-wrapper
+++ b/build/linux/pkg-config-wrapper
@@ -33,7 +33,13 @@ fi
rewrite=`dirname $0`/rewrite_dirs.py
package=${!#}
-config_path=$root/usr/$libpath/pkgconfig:$root/usr/share/pkgconfig
+if [ -z "$PKG_CONFIG_PATH" ]
+then
+ config_path=$root/usr/$libpath/pkgconfig:$root/usr/share/pkgconfig
+else
+ config_path="$PKG_CONFIG_PATH"
+fi
+
set -e
# Some sysroots, like the Chromium OS ones, may generate paths that are not
# relative to the sysroot. For example,
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698