diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-10-04 04:27:18 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-04 04:27:18 +0100 |
| commit | fa275aeb316ed5e68498ca0057b27a1e9c887e26 (patch) | |
| tree | 1a167f06787ef709edff61d90f369164a0683705 /eclass | |
| parent | 9b22dab88308071d43d47cd078b37903900f47d3 (diff) | |
gentoo auto-resync : 04:10:2024 - 04:27:17
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39749 -> 39752 bytes | |||
| -rw-r--r-- | eclass/toolchain.eclass | 18 |
2 files changed, 10 insertions, 8 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex c712e2934830..2fde51369c73 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 1c990f1f1114..a2eba0a9297e 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -844,10 +844,11 @@ toolchain_setup_ada() { # GNAT can usually be built using the last major version and # the current version, at least. # - # We always prefer the version being built if possible - # as it has the greatest chance of success. Failing that, - # try GCC 10 and iterate upwards. - for ada_candidate in ${SLOT} $(seq 10 ${latest_gcc}) ; do + # Order of preference (descending): + # 1) Match the version being built; + # 2) Iterate downwards from the version being built; + # 3) Iterate upwards from the version being built to the greatest version installed. + for ada_candidate in ${SLOT} $(seq $((${SLOT} - 1)) -1 10) $(seq $((${SLOT} + 1)) ${latest_gcc}) ; do has_version -b "sys-devel/gcc:${ada_candidate}" || continue ebegin "Testing sys-devel/gcc:${ada_candidate} for Ada" @@ -1005,10 +1006,11 @@ toolchain_setup_d() { local d_bootstrap local d_candidate - # We always prefer the version being built if possible - # as it has the greatest chance of success. Failing that, - # try GCC 10 and iterate upwards. - for d_candidate in ${SLOT} $(seq 10 ${latest_gcc}) ; do + # Order of preference (descending): + # 1) Match the version being built; + # 2) Iterate downwards from the version being built; + # 3) Iterate upwards from the version being built to the greatest version installed. + for d_candidate in ${SLOT} $(seq $((${SLOT} - 1)) -1 10) $(seq $((${SLOT} + 1)) ${latest_gcc}) ; do has_version -b "sys-devel/gcc:${d_candidate}" || continue ebegin "Testing sys-devel/gcc:${d_candidate} for D" |