summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-01-26 22:07:10 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-01-26 22:08:12 +0000
commit7a39a55b4db6682b7f99a7f9991eed3ca5bf7c5e (patch)
tree357ff355249e5a31ddf82b7b5ecb07b970060015 /eclass
parentdev-ruby/minitest-global_expectations: x86 keyworded (bug #706388) (diff)
downloadgentoo-7a39a55b4db6682b7f99a7f9991eed3ca5bf7c5e.tar.gz
gentoo-7a39a55b4db6682b7f99a7f9991eed3ca5bf7c5e.tar.bz2
gentoo-7a39a55b4db6682b7f99a7f9991eed3ca5bf7c5e.zip
toolchain.eclass: restore an option to override GCC_CONFIG_VER
dev-lang/gnat-gpl ebuilds override this option and affect at least default slot installed. Let's partially revert the behaviour until ada is migrated. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 767240eb7f2..3614f870b52 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -76,7 +76,9 @@ GCCMICRO=$(ver_cut 3 ${GCC_PV})
# gcc hardcodes it's internal version into gcc/BASE-VER
# and assumes various directories and tools to have the
# same name.
-GCC_CONFIG_VER=${GCC_RELEASE_VER}
+# TODO: once ada ebuilds are fixed turn it to
+# GCC_CONFIG_VER=${GCC_RELEASE_VER}
+GCC_CONFIG_VER=${GCC_CONFIG_VER:-GCC_RELEASE_VER}
# Pre-release support. Versioning schema:
# 1.0.0_pre9999: live ebuild