mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-11 06:56:58 +02:00
eclass/toolchain: Sync with Gentoo
It's from Gentoo commit b6706bf513d4ddfd48b16871ecb062746aab6dec.
This commit is contained in:
parent
3e4ea8ce36
commit
327ac5706a
@ -1921,10 +1921,13 @@ toolchain_src_configure() {
|
|||||||
# respect USE=graphite here in case the user passes some
|
# respect USE=graphite here in case the user passes some
|
||||||
# graphite flags rather than try strip them out.
|
# graphite flags rather than try strip them out.
|
||||||
$(use_with graphite isl)
|
$(use_with graphite isl)
|
||||||
$(use_with zstd)
|
|
||||||
--with-system-zlib
|
--with-system-zlib
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if tc_has_feature zstd ; then
|
||||||
|
confgcc_jit+=( $(use_with zstd) )
|
||||||
|
fi
|
||||||
|
|
||||||
if tc_version_is_at_least 15.0.0_pre20241124 ${PV} ; then
|
if tc_version_is_at_least 15.0.0_pre20241124 ${PV} ; then
|
||||||
confgcc_jit+=( $(use_enable libgdiagnostics) )
|
confgcc_jit+=( $(use_enable libgdiagnostics) )
|
||||||
fi
|
fi
|
||||||
@ -2132,11 +2135,6 @@ gcc_do_filter_flags() {
|
|||||||
filter-flags -fdiagnostics-set-output=text:experimental-nesting=yes
|
filter-flags -fdiagnostics-set-output=text:experimental-nesting=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if is_d ; then
|
|
||||||
# bug #940750
|
|
||||||
filter-flags -Warray-bounds
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Please use USE=lto instead (bug #906007).
|
# Please use USE=lto instead (bug #906007).
|
||||||
filter-lto
|
filter-lto
|
||||||
|
|
||||||
@ -2325,23 +2323,31 @@ gcc_do_make() {
|
|||||||
STAGE1_CFLAGS=${STAGE1_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
|
STAGE1_CFLAGS=${STAGE1_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
|
||||||
# multilib.eclass lacks get_abi_CXXFLAGS (bug #940501)
|
# multilib.eclass lacks get_abi_CXXFLAGS (bug #940501)
|
||||||
STAGE1_CXXFLAGS=${STAGE1_CXXFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CXXFLAGS}"}
|
STAGE1_CXXFLAGS=${STAGE1_CXXFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CXXFLAGS}"}
|
||||||
|
# Default to CFLAGS for GDCFLAGS if unset
|
||||||
|
STAGE1_GDCFLAGS=${STAGE1_GDCFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
|
||||||
STAGE1_LDFLAGS=${STAGE1_LDFLAGS-"${abi_ldflags} ${LDFLAGS}"}
|
STAGE1_LDFLAGS=${STAGE1_LDFLAGS-"${abi_ldflags} ${LDFLAGS}"}
|
||||||
BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
|
BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
|
||||||
BOOT_LDFLAGS=${BOOT_LDFLAGS-"${abi_ldflags} ${LDFLAGS}"}
|
BOOT_LDFLAGS=${BOOT_LDFLAGS-"${abi_ldflags} ${LDFLAGS}"}
|
||||||
LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}"
|
LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}"
|
||||||
|
|
||||||
# If we need to in future, we could really simplify this
|
if _tc_use_if_iuse d ; then
|
||||||
# to just be unconditional for stage1. It doesn't really
|
# If we need to in future, we could really simplify this
|
||||||
# matter there. If we want to go in the other direction
|
# to just be unconditional for stage1. It doesn't really
|
||||||
# and make this more conditional, we could check if
|
# matter there. If we want to go in the other direction
|
||||||
# the bootstrap compiler is < GCC 12. See bug #940470.
|
# and make this more conditional, we could check if
|
||||||
if _tc_use_if_iuse d && use hardened ; then
|
# the bootstrap compiler is < GCC 12. See bug #940470.
|
||||||
STAGE1_CXXFLAGS+=" -U_GLIBCXX_ASSERTIONS"
|
if use hardened ; then
|
||||||
|
STAGE1_CXXFLAGS+=" -U_GLIBCXX_ASSERTIONS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# This can be dropped a while after 2025-03-31 (bug #940750).
|
||||||
|
STAGE1_GDCFLAGS+=" -Wno-array-bounds"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
emakeargs+=(
|
emakeargs+=(
|
||||||
STAGE1_CFLAGS="${STAGE1_CFLAGS}"
|
STAGE1_CFLAGS="${STAGE1_CFLAGS}"
|
||||||
STAGE1_CXXFLAGS="${STAGE1_CXXFLAGS}"
|
STAGE1_CXXFLAGS="${STAGE1_CXXFLAGS}"
|
||||||
|
STAGE1_GDCFLAGS="${STAGE1_GDCFLAGS}"
|
||||||
STAGE1_LDFLAGS="${STAGE1_LDFLAGS}"
|
STAGE1_LDFLAGS="${STAGE1_LDFLAGS}"
|
||||||
BOOT_CFLAGS="${BOOT_CFLAGS}"
|
BOOT_CFLAGS="${BOOT_CFLAGS}"
|
||||||
BOOT_LDFLAGS="${BOOT_LDFLAGS}"
|
BOOT_LDFLAGS="${BOOT_LDFLAGS}"
|
||||||
|
Loading…
Reference in New Issue
Block a user