[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas K. Hüttel]

commit:     e9de55e783f386e9366434d541e8e1eeba6d0c8f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 19:10:34 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 20:13:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9de55e7

multilib.eclass: Default values, not fixed values, for risc-v libdir

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 eclass/multilib.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 095e3a4f450..93c062cb36a 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}