diff options
| author |   Aric Belsito <lluixhi@gmail.com> | 2018-05-17 11:15:06 -0700 |
|---|---|---|
| committer | Aric Belsito <lluixhi@gmail.com> | 2018-05-17 11:15:06 -0700 |
| commit | 3b125569cb62d55c839898351dc7238d185923d9 (patch) | |
| tree | 14480681622b08432d963d177e457268cfa6f07f | |
| parent | sys-devel/gcc: version bump to 8.1.0-r3 (diff) | |
| download | musl-3b125569.tar.gz musl-3b125569.tar.bz2 musl-3b125569.zip | |
toolchain.eclass: sync with upstream
| -rw-r--r-- | eclass/toolchain.eclass | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 47e99ac3..0163767e 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -137,7 +137,8 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" [[ -n ${D_VER} ]] && IUSE+=" d" [[ -n ${SPECS_VER} ]] && IUSE+=" nossp" - tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc" + tc_version_is_at_least 3 && IUSE+=" doc hardened multilib objc" + tc_version_is_between 3 7 && IUSE+=" awt gcj" tc_version_is_at_least 3.3 && IUSE+=" pgo" tc_version_is_at_least 4.0 && IUSE+=" objc-gc" tc_version_is_between 4.0 4.9 && IUSE+=" mudflap" @@ -149,9 +150,12 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then # versions which we dropped. Since graphite was also experimental in # the older versions, we don't want to bother supporting it. #448024 tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize ) - tc_version_is_at_least 4.9 && IUSE+=" cilk +vtv" + tc_version_is_between 4.9 8 && IUSE+=" cilk" + tc_version_is_at_least 4.9 && IUSE+=" +vtv" tc_version_is_at_least 5.0 && IUSE+=" jit mpx" tc_version_is_at_least 6.0 && IUSE+=" +pie +ssp +pch" + # systemtap is a gentoo-specific switch: bug #654748 + tc_version_is_at_least 8.0 && IUSE+=" systemtap" fi IUSE+=" ${IUSE_DEF[*]/#/+}" @@ -218,6 +222,11 @@ if in_iuse gcj ; then DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )" fi +if in_iuse systemtap ; then + # gcc needs sys/sdt.h headers on target + DEPEND+=" systemtap? ( dev-util/systemtap )" +fi + PDEPEND=">=sys-devel/gcc-config-1.7" #---->> S + SRC_URI essentials <<---- @@ -1208,7 +1217,17 @@ toolchain_src_configure() { if hardened_gcc_is_stable ssp; then export gcc_cv_libc_provides_ssp=yes fi - confgcc+=( --disable-libssp ) + if use_if_iuse ssp; then + # On some targets USE="ssp -libssp" is an invalid + # configuration as target libc does not provide + # stack_chk_* functions. Do not disable libssp there. + case ${CTARGET} in + mingw*|*-mingw*) ewarn "Not disabling libssp" ;; + *) confgcc+=( --disable-libssp ) ;; + esac + else + confgcc+=( --disable-libssp ) + fi fi fi @@ -1220,6 +1239,10 @@ toolchain_src_configure() { confgcc+=( $(use_enable mpx libmpx) ) fi + if in_iuse systemtap ; then + confgcc+=( $(use_enable systemtap) ) + fi + if in_iuse vtv ; then confgcc+=( $(use_enable vtv vtable-verify) |