diff options
| author |   Sam James <sam@gentoo.org> | 2022-05-30 07:25:07 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-05-30 07:29:23 +0100 |
| commit | 73e756bb1320787d68f55e99405baffd37b6d2ee (patch) | |
| tree | 2e8b97474fd17db83989a6c33b4793bd24f0413c /eclass | |
| parent | toolchain.eclass: prepend output sync again (diff) | |
| download | gentoo-73e756bb1320787d68f55e99405baffd37b6d2ee.tar.gz gentoo-73e756bb1320787d68f55e99405baffd37b6d2ee.tar.bz2 gentoo-73e756bb1320787d68f55e99405baffd37b6d2ee.zip | |
toolchain.eclass: add bootstrap-set build config if USE=cet
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index aa0cfb1cd612..bd7da8ced160 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -817,6 +817,8 @@ toolchain_src_configure() { local confgcc=( --host=${CHOST} ) + local build_config_targets=() + if is_crosscompile || tc-is-cross-compiler ; then # Straight from the GCC install doc: # "GCC has code to correctly determine the correct value for target @@ -918,7 +920,11 @@ toolchain_src_configure() { # Build compiler itself using LTO if tc_version_is_at_least 9.1 && _tc_use_if_iuse lto ; then - confgcc+=( --with-build-config=bootstrap-lto ) + build_config_targets+=( bootstrap-lto ) + fi + + if tc_version_is_at_least 12 && _tc_use_if_iuse cet ; then + build_config_targets+=( bootstrap-cet ) fi # Support to disable PCH when building libstdcxx @@ -1321,7 +1327,12 @@ toolchain_src_configure() { # killing the 32bit builds which want /usr/lib. export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries=' - confgcc+=( "$@" ${EXTRA_ECONF} ) + confgcc+=( "$@" ) + + if [[ -n ${build_config_targets} ]] ; then + # ./configure --with-build-config='bootstrap-lto bootstrap-cet' + confgcc+=( --with-build-config="${build_config_targets[*]}" ) + fi # Nothing wrong with a good dose of verbosity echo |