diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-07-09 00:03:15 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-09-03 13:05:55 +0200 |
| commit | ffc59b9e2bbe9ad89a1ab60e3a147785fe944141 (patch) | |
| tree | 1667606ac698f2cdab03dac4fa54205538315814 | |
| parent | multilib.eclass: get_exeext for mingw/cygwin exe suffix, #588330 (diff) | |
| download | gentoo-ffc59b9e.tar.gz gentoo-ffc59b9e.tar.bz2 gentoo-ffc59b9e.zip | |
sys-libs/glibc: Do not reset multilib vars unless cross-compiling, #588368
Do not call multilib_env_reset unless cross-compiling, in order to
prevent the function from redefining profile-defined variables such as
LIBDIR_*.
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index e56f10eb52ba..370782b4b4f3 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -318,8 +318,9 @@ setup_env() { unset LD_RUN_PATH unset LD_ASSUME_KERNEL - multilib_env ${CTARGET_OPT:-${CTARGET}} if is_crosscompile || tc-is-cross-compiler ; then + multilib_env ${CTARGET_OPT:-${CTARGET}} + if ! use multilib ; then MULTILIB_ABIS=${DEFAULT_ABI} else |