diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-10-11 05:27:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-10-11 05:27:57 +0000 |
| commit | 32aa3046a48c8f6057e48e9422d118ea3ef69ea9 (patch) | |
| tree | 225c6ec4af39925e46f20f20530881002352e6eb /sys-devel/gcc-config/files | |
| parent | old (diff) | |
| download | gentoo-2-32aa3046a48c8f6057e48e9422d118ea3ef69ea9.tar.gz gentoo-2-32aa3046a48c8f6057e48e9422d118ea3ef69ea9.tar.bz2 gentoo-2-32aa3046a48c8f6057e48e9422d118ea3ef69ea9.zip | |
Make sure we dont create CTARGET-VER entries in env.d #195054.
(Portage version: 2.1.3.12)
Diffstat (limited to 'sys-devel/gcc-config/files')
| -rw-r--r-- | sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r4 | 0 | ||||
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.4.0 | 8 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r4 b/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r4 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r4 diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0 index 68de99859ee8..e9dfe5d9dcbb 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.4.0 +++ b/sys-devel/gcc-config/files/gcc-config-1.4.0 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.22 2007/10/07 04:20:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.23 2007/10/11 05:27:57 vapier Exp $ trap ":" INT QUIT TSTP @@ -265,7 +265,9 @@ switch_profile() { # Punt old files rm -f "${ENV_D}/05gcc" + rm -f "${ENV_D}/05gcc-${CTARGET}"-* rm -f "${GCC_ENV_D}/config" + rm -f "${GCC_ENV_D}/config-${CTARGET}"-* fi # Find the bin wrapper @@ -715,7 +717,9 @@ done ${SET_X} && set -x get_real_chost -CTARGET=${CTARGET:-${CC_COMP:-${REAL_CHOST}}} +[[ ${DOIT} == "get_current_profile" ]] \ + && CTARGET=${CTARGET:-${CC_COMP:-${REAL_CHOST}}} \ + || CTARGET=${CTARGET:-${REAL_CHOST}} if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then usage 1 |