| 1 |
commit: 2734048bc5149bc247fb0482fae9f1f713601e90 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 11 12:54:43 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 11 12:55:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2734048b |
| 7 |
|
| 8 |
eclass/toolchain.eclass: fix after commit 1fa41385 |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/toolchain.eclass | 9 ++++++++- |
| 13 |
1 file changed, 8 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 16 |
index be94db8..a3c901d 100644 |
| 17 |
--- a/eclass/toolchain.eclass |
| 18 |
+++ b/eclass/toolchain.eclass |
| 19 |
@@ -1104,6 +1104,9 @@ toolchain_src_configure() { |
| 20 |
*-elf|*-eabi) |
| 21 |
confgcc+=( --with-newlib ) |
| 22 |
;; |
| 23 |
+ *-musl*) |
| 24 |
+ confgcc+=( --enable-__cxa_atexit ) |
| 25 |
+ ;; |
| 26 |
*-gnu*) |
| 27 |
confgcc+=( |
| 28 |
--enable-__cxa_atexit |
| 29 |
@@ -2455,12 +2458,16 @@ hardened_gcc_is_stable() { |
| 30 |
if [[ $1 == "pie" ]] ; then |
| 31 |
if [[ ${CTARGET} == *-uclibc* ]] ; then |
| 32 |
tocheck=${PIE_UCLIBC_STABLE} |
| 33 |
- else |
| 34 |
+ elif [[ ${CTARGET} == *-musl* ]] ; then |
| 35 |
+ tocheck=${PIE_MUSL_STABLE} |
| 36 |
+ elif [[ ${CTARGET} == *-gnu* ]] ; then |
| 37 |
tocheck=${PIE_GLIBC_STABLE} |
| 38 |
fi |
| 39 |
elif [[ $1 == "ssp" ]] ; then |
| 40 |
if [[ ${CTARGET} == *-uclibc* ]] ; then |
| 41 |
tocheck=${SSP_UCLIBC_STABLE} |
| 42 |
+ elif [[ ${CTARGET} == *-musl* ]] ; then |
| 43 |
+ tocheck=${SSP_MUSL_STABLE} |
| 44 |
elif [[ ${CTARGET} == *-gnu* ]] ; then |
| 45 |
tocheck=${SSP_STABLE} |
| 46 |
fi |
Archives