diff options
author | Sam James <sam@gentoo.org> | 2024-11-19 14:49:04 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-11-19 14:50:08 +0000 |
commit | f6a974f8f2378c6c6a83345c101afce233fdf1d7 (patch) | |
tree | b7be839babdf5af8ba7cd4037b3247dc929e225c /eclass | |
parent | dev-libs/log4cxx: drop 0.11.0 (drops ~amd64-linux & ~ppc-macos) (diff) | |
download | gentoo-f6a974f8f2378c6c6a83345c101afce233fdf1d7.tar.gz gentoo-f6a974f8f2378c6c6a83345c101afce233fdf1d7.tar.bz2 gentoo-f6a974f8f2378c6c6a83345c101afce233fdf1d7.zip |
toolchain.eclass: fix libdiagnostics handling
Reported by ulm. This was introduced by a last-minute simplification I made,
but USE=libdiagnostics only exists for 9999 and the *next* snapshot, not
the current one, but even then, the code was wrong for < 15 as the use_enable
part was run unconditionally w/ USE=jit.
Fixes: b923a4c0d1a330e40f0a05f3bc94bb4f32ce1cbb
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/toolchain.eclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index edff7254c905..e28479dc44af 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1761,7 +1761,6 @@ toolchain_src_configure() { --enable-host-shared --enable-languages=jit - $(use_enable libdiagnostics) # Might be used for the just-built GCC. Easier to just # respect USE=graphite here in case the user passes some @@ -1771,6 +1770,10 @@ toolchain_src_configure() { --with-system-zlib ) + if tc_version_is_at_least 15.0.0_pre20241124 ; then + confgcc_jit+=( $(use_enable libdiagnostics) ) + fi + if tc_version_is_at_least 13.1 ; then confgcc_jit+=( --disable-fixincludes ) fi |