diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-11 23:11:13 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-11 23:53:08 +0000 |
| commit | 12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2 (patch) | |
| tree | fc7b3d8a1e445c341859881a07d643fa0944187e /eclass/toolchain.eclass | |
| parent | app-text/sigil: Drop 0.9.13 (diff) | |
| download | gentoo-12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2.tar.gz gentoo-12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2.tar.bz2 gentoo-12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2.zip | |
toolchain.eclass: fix arch downgrade for gcc-10
The bug is in lexical comparison instead of version compare.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 5f9bd7750dda..bd3d024f9891 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1406,7 +1406,8 @@ downgrade_arch_flags() { local arch bver i isa myarch mytune rep ver bver=${1:-${GCC_BRANCH_VER}} - [[ $(gcc-version) < ${bver} ]] && return 0 + # Don't perform downgrade if running gcc is older than ebuild's. + tc_version_is_at_least ${bver} $(gcc-version) || return 0 [[ $(tc-arch) != amd64 && $(tc-arch) != x86 ]] && return 0 myarch=$(get-flag march) @@ -1414,7 +1415,7 @@ downgrade_arch_flags() { # If -march=native isn't supported we have to tease out the actual arch if [[ ${myarch} == native || ${mytune} == native ]] ; then - if [[ ${bver} < 4.2 ]] ; then + if ! tc_version_is_at_least 4.2 ${bver}; then arch=$($(tc-getCC) -march=native -v -E -P - </dev/null 2>&1 \ | sed -rn "/cc1.*-march/s:.*-march=([^ ']*).*:\1:p") replace-cpu-flags native ${arch} @@ -1422,10 +1423,10 @@ downgrade_arch_flags() { fi # Handle special -mtune flags - [[ ${mytune} == intel && ${bver} < 4.9 ]] && replace-cpu-flags intel generic - [[ ${mytune} == generic && ${bver} < 4.2 ]] && filter-flags '-mtune=*' + [[ ${mytune} == intel ]] && ! tc_version_is_at_least 4.9 ${bver} && replace-cpu-flags intel generic + [[ ${mytune} == generic ]] && ! tc_version_is_at_least 4.2 ${bver} && filter-flags '-mtune=*' [[ ${mytune} == x86-64 ]] && filter-flags '-mtune=*' - [[ ${bver} < 3.4 ]] && filter-flags '-mtune=*' + tc_version_is_at_least 3.4 ${bver} || filter-flags '-mtune=*' # "added" "arch" "replacement" local archlist=( @@ -1475,8 +1476,8 @@ downgrade_arch_flags() { [[ ${myarch} != ${arch} && ${mytune} != ${arch} ]] && continue - if [[ ${ver} > ${bver} ]] ; then - einfo "Replacing ${myarch} (added in gcc ${ver}) with ${rep}..." + if ! tc_version_is_at_least ${ver} ${bver}; then + einfo "Downgrading '${myarch}' (added in gcc ${ver}) with '${rep}'..." [[ ${myarch} == ${arch} ]] && replace-cpu-flags ${myarch} ${rep} [[ ${mytune} == ${arch} ]] && replace-cpu-flags ${mytune} ${rep} continue @@ -1524,7 +1525,7 @@ downgrade_arch_flags() { for ((i = 0; i < ${#isalist[@]}; i += 2)) ; do ver=${isalist[i]} isa=${isalist[i + 1]} - [[ ${ver} > ${bver} ]] && filter-flags ${isa} ${isa/-m/-mno-} + tc_version_is_at_least ${ver} ${bver} || filter-flags ${isa} ${isa/-m/-mno-} done } |