From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- eclass/multilib.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'eclass/multilib.eclass') diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 095e3a4f4508..93c062cb36ac 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -399,22 +399,22 @@ multilib_env() { export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d -march=rv64imafdc} export CHOST_lp64d=${CTARGET} export CTARGET_lp64d=${CTARGET} - export LIBDIR_lp64d="lib64/lp64d" + export LIBDIR_lp64d=${LIBDIR_lp64d-lib64/lp64d} export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64 -march=rv64imac} export CHOST_lp64=${CTARGET} export CTARGET_lp64=${CTARGET} - export LIBDIR_lp64="lib64/lp64" + export LIBDIR_lp64=${LIBDIR_lp64-lib64/lp64} export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d -march=rv32imafdc} export CHOST_ilp32d=${CTARGET/riscv64/riscv32} export CTARGET_ilp32d=${CTARGET/riscv64/riscv32} - export LIBDIR_ilp32d="lib32/ilp32d" + export LIBDIR_ilp32d=${LIBDIR_ilp32d-lib32/ilp32d} export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac} export CHOST_ilp32=${CTARGET/riscv64/riscv32} export CTARGET_ilp32=${CTARGET/riscv64/riscv32} - export LIBDIR_ilp32="lib32/ilp32" + export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32} : ${DEFAULT_ABI=lp64d} @@ -423,12 +423,12 @@ multilib_env() { export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d} export CHOST_ilp32d=${CTARGET} export CTARGET_ilp32d=${CTARGET} - export LIBDIR_ilp32d="lib32/ilp32d" + export LIBDIR_ilp32d=${LIBDIR_ilp32d-lib32/ilp32d} export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac} export CHOST_ilp32=${CTARGET} export CTARGET_ilp32=${CTARGET} - export LIBDIR_ilp32="lib32/ilp32" + export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} : ${MULTILIB_ABIS=ilp32d ilp32} : ${DEFAULT_ABI=ilp32d} -- cgit v1.2.3