sysroot_lib: have generated pkg-config clear PKG_CONFIG_PATH
The upstream portage multilib logic tries to help the build out and
export a PKG_CONFIG_PATH setting for that multilib. Unfortunately
this breaks cross-compiling badly. Nuke it until we can figure out
the right answer in conjunction with upstream.
BUG=chromium:489641
TEST=precq passes
TEST=`cbuildbot {arm,amd64,x86}-generic-full` works
Change-Id: I1edb58970d803916f99ef960b0e553abf6091151
Reviewed-on: https://chromium-review.googlesource.com/273969
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Nam Nguyen <namnguyen@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
diff --git a/lib/sysroot_lib.py b/lib/sysroot_lib.py
index 0801b81..12a6538 100644
--- a/lib/sysroot_lib.py
+++ b/lib/sysroot_lib.py
@@ -50,6 +50,10 @@
export PKG_CONFIG_SYSROOT_DIR="{sysroot}"
+# Portage will get confused and try to "help" us by exporting this.
+# Undo that logic.
+unset PKG_CONFIG_PATH
+
exec pkg-config "$@"
"""
