summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2020-06-06 15:00:15 -0400
committerMike Gilbert <floppym@gentoo.org>2020-06-13 12:58:15 -0400
commite76c7f69bf4755eb3c08aa290d072541d0fd65db (patch)
tree05a3672cab2f93758e2bf9bc5451e5b963426f3c /eclass/multilib.eclass
parentmultilib.eclass: export PKG_CONFIG_SYSTEM_LIBRARY_PATH in multilib_toolchain_... (diff)
downloadgentoo-e76c7f69bf4755eb3c08aa290d072541d0fd65db.tar.gz
gentoo-e76c7f69bf4755eb3c08aa290d072541d0fd65db.tar.bz2
gentoo-e76c7f69bf4755eb3c08aa290d072541d0fd65db.zip
multilib.eclass: export PKG_CONFIG in multilib_toolchain_setup
This ensures that autoconf will not try to use a crossdev wrapper for non-native ABIs. Instead, we always use the native pkg-config, and override its behavior via PKG_CONFIG_LIBDIR and PKG_CONFIG_SYSTEM_LIBRARY_PATH. Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass/multilib.eclass')
-rw-r--r--eclass/multilib.eclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 3503ac2ed5b7..54ff1509eada 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -467,6 +467,7 @@ multilib_toolchain_setup() {
LD
NM
OBJDUMP
+ PKG_CONFIG
RANLIB
READELF
STRIP
@@ -511,6 +512,7 @@ multilib_toolchain_setup() {
export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm'
export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use '${CHOST}-objdump'
+ export PKG_CONFIG="$(tc-getPKG_CONFIG)"
export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use '${CHOST}-ranlib'
export READELF="$(tc-getREADELF)" # Avoid 'readelf', use '${CHOST}-readelf'
export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip'