[gentoo-commits] proj/musl:master commit in: eclass/

[Anthony G. Basile]

commit:     2734048bc5149bc247fb0482fae9f1f713601e90
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 12:54:43 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 12:55:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=2734048b

eclass/toolchain.eclass: fix after commit 1fa41385

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 eclass/toolchain.eclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index be94db8..a3c901d 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1104,6 +1104,9 @@ toolchain_src_configure() {
        *-elf|*-eabi)
                confgcc+=( --with-newlib )
                ;;
+       *-musl*)
+               confgcc+=( --enable-__cxa_atexit )
+               ;;
        *-gnu*)
                confgcc+=(
                        --enable-__cxa_atexit
@@ -2455,12 +2458,16 @@ hardened_gcc_is_stable() {
        if [[ $1 == "pie" ]] ; then
                if [[ ${CTARGET} == *-uclibc* ]] ; then
                        tocheck=${PIE_UCLIBC_STABLE}
-               else
+               elif [[ ${CTARGET} == *-musl* ]] ; then
+                       tocheck=${PIE_MUSL_STABLE}
+               elif [[ ${CTARGET} == *-gnu* ]] ; then
                        tocheck=${PIE_GLIBC_STABLE}
                fi
        elif [[ $1 == "ssp" ]] ; then
                if [[ ${CTARGET} == *-uclibc* ]] ; then
                        tocheck=${SSP_UCLIBC_STABLE}
+               elif [[ ${CTARGET} == *-musl* ]] ; then
+                       tocheck=${SSP_MUSL_STABLE}
                elif  [[ ${CTARGET} == *-gnu* ]] ; then
                        tocheck=${SSP_STABLE}
                fi