Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gcc-config:master commit in: /
Date: Fri, 06 Sep 2019 07:29:27
Message-Id: 1567754898.8cd0c018d26ed6c61ee499b8673ef19266be1aa9.slyfox@gentoo
1 commit: 8cd0c018d26ed6c61ee499b8673ef19266be1aa9
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 6 07:28:18 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 6 07:28:18 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=8cd0c018
7
8 gcc-config: drop /etc/env.d/gcc/config migration code
9
10 /etc/env.d/gcc/config migraion was enabled 7 years ago.
11 Let's assume everyone migrated by now.
12
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 gcc-config | 14 --------------
16 1 file changed, 14 deletions(-)
17
18 diff --git a/gcc-config b/gcc-config
19 index 99489f9..21d54c1 100755
20 --- a/gcc-config
21 +++ b/gcc-config
22 @@ -1017,20 +1017,6 @@ get_chost
23 && : ${CTARGET:=${CC_COMP:-${CHOST}}} \
24 || : ${CTARGET:=${CHOST}}
25
26 -# Do migration of old files
27 -if [[ -e ${GCC_ENV_D}/config ]] ; then
28 - (
29 - unset CURRENT
30 - . "${GCC_ENV_D}"/config
31 - if [[ ${CURRENT} == ${CTARGET}-* ]] ; then
32 - mv "${GCC_ENV_D}"/config "${GCC_ENV_D}"/config-${CTARGET} || exit 1
33 - else
34 - # who knows; force a refresh by punting it
35 - rm -f "${GCC_ENV_D}"/config || exit 1
36 - fi
37 - ) || die "could not get rid of old ${GCC_ENV_D}/config"
38 -fi
39 -
40 if [[ -z ${CC_COMP} ]] ; then
41 CC_COMP=$(get_current_profile)
42 if [[ $? -ne 0 ]] ; then