[PATCH 89/94] multilib.eclass: handle multilib on Hurd in multilib_env
Sam James <[email protected]>
| Newsgroups | gmane.linux.gentoo.devel |
|---|---|
| Message-ID | <44214406ca185145a0875aa576e10a0385555697.1774994374.git.sam@gentoo.org> |
We need this otherwise glibc will try to install to the wrong directory on Hurd for the cross package (as we don't have a profile at that point). Signed-off-by: Sam James <[email protected]> --- eclass/multilib.eclass | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 15c44e03a0c92..c11d924bcf2d0 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -284,6 +284,26 @@ multilib_env() { # - https://bugs.gentoo.org/675954 # - https://gcc.gnu.org/PR90077 # - https://github.com/gentoo/musl/issues/245 + : "${MULTILIB_ABIS=default}" + : "${DEFAULT_ABI=default}" + export MULTILIB_ABIS DEFAULT_ABI + return + ;; + *-linux*) + # Nothing here. + ;; + *-gnu) + case ${CTARGET} in + x86_64*) + # On Hurd, we don't do multilib. + MULTILIB_ABIS="amd64" + CHOST_amd64="${CTARGET}" + LIBDIR_amd64="lib64" + ;; + *) + ;; + esac + : "${MULTILIB_ABIS=default}" : "${DEFAULT_ABI=default}" export MULTILIB_ABIS DEFAULT_ABI -- 2.53.0