| 1 |
commit: ffc59b9e2bbe9ad89a1ab60e3a147785fe944141 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 8 22:03:15 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 11:05:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc59b9e |
| 7 |
|
| 8 |
sys-libs/glibc: Do not reset multilib vars unless cross-compiling, #588368 |
| 9 |
|
| 10 |
Do not call multilib_env_reset unless cross-compiling, in order to |
| 11 |
prevent the function from redefining profile-defined variables such as |
| 12 |
LIBDIR_*. |
| 13 |
|
| 14 |
sys-libs/glibc/files/eblits/common.eblit | 3 ++- |
| 15 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit |
| 18 |
index e56f10e..370782b 100644 |
| 19 |
--- a/sys-libs/glibc/files/eblits/common.eblit |
| 20 |
+++ b/sys-libs/glibc/files/eblits/common.eblit |
| 21 |
@@ -318,8 +318,9 @@ setup_env() { |
| 22 |
unset LD_RUN_PATH |
| 23 |
unset LD_ASSUME_KERNEL |
| 24 |
|
| 25 |
- multilib_env ${CTARGET_OPT:-${CTARGET}} |
| 26 |
if is_crosscompile || tc-is-cross-compiler ; then |
| 27 |
+ multilib_env ${CTARGET_OPT:-${CTARGET}} |
| 28 |
+ |
| 29 |
if ! use multilib ; then |
| 30 |
MULTILIB_ABIS=${DEFAULT_ABI} |
| 31 |
else |
Archives