diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
| commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
| tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /eclass/multilib.eclass | |
| parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) | |
gentoo resync : 21.06.2020
Diffstat (limited to 'eclass/multilib.eclass')
| -rw-r--r-- | eclass/multilib.eclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index ed54568aa2d9..342d21a2e1c3 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -467,11 +467,14 @@ multilib_toolchain_setup() { LD NM OBJDUMP + PKG_CONFIG RANLIB READELF + STRINGS STRIP PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + PKG_CONFIG_SYSTEM_LIBRARY_PATH ) # First restore any saved state we have laying around. @@ -502,6 +505,7 @@ multilib_toolchain_setup() { # # Make sure ${save_restore_variables[@]} list matches below. export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) + export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar' export CC="$(tc-getCC) $(get_abi_CFLAGS)" export CXX="$(tc-getCXX) $(get_abi_CFLAGS)" @@ -510,12 +514,16 @@ 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 STRINGS="$(tc-getSTRINGS)" # Avoid 'strings', use '${CHOST}-strings' export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip' + export CHOST=$(get_abi_CHOST $1) export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig + export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir) fi } |