diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-07-10 06:18:55 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-10 06:18:55 +0000 |
| commit | 00d7ced74b09811c60bc1d2d6670419e82741822 (patch) | |
| tree | 920191448936e4285a11199c25f932395a62ff16 /sys-devel/gcc-config/files | |
| parent | default to a pc vendor only for x86/amd64 (diff) | |
| download | gentoo-2-00d7ced74b09811c60bc1d2d6670419e82741822.tar.gz gentoo-2-00d7ced74b09811c60bc1d2d6670419e82741822.tar.bz2 gentoo-2-00d7ced74b09811c60bc1d2d6670419e82741822.zip | |
when asking for the current profile of a cross target that has yet to be configured, make sure we error out
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-devel/gcc-config/files')
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.3.11 | 7 | ||||
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.3.12 | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.11 b/sys-devel/gcc-config/files/gcc-config-1.3.11 index baf9985391f3..ae32f91667a0 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.11 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.11 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 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.3.11,v 1.6 2005/07/07 23:03:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.11,v 1.7 2005/07/10 06:18:55 vapier Exp $ trap ":" INT QUIT TSTP @@ -295,7 +295,7 @@ get_current_profile() { local conf="${GCC_ENV_D}/config" if [[ -n ${CTARGET} ]] ; then conf="${conf}-${CTARGET}" - elif [[ -f ${GCC_ENV_D}/config-${CC_COMP} ]] ; then + elif [[ -n ${CC_COMP} ]] && is_cross_compiler ; then conf="${conf}-${CC_COMP}" fi @@ -506,8 +506,7 @@ if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then fi if [[ -z ${CC_COMP} ]] ; then - if get_current_profile &>/dev/null - then + if get_current_profile &>/dev/null ; then CC_COMP="$(get_current_profile)" else list_profiles diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.12 b/sys-devel/gcc-config/files/gcc-config-1.3.12 index 926ac6554f6a..8dfe697d856f 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.12 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.12 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 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.3.12,v 1.1 2005/07/09 16:52:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.2 2005/07/10 06:18:55 vapier Exp $ trap ":" INT QUIT TSTP @@ -296,7 +296,7 @@ get_current_profile() { local conf="${GCC_ENV_D}/config" if [[ -n ${CTARGET} ]] ; then conf="${conf}-${CTARGET}" - elif [[ -f ${GCC_ENV_D}/config-${CC_COMP} ]] ; then + elif [[ -n ${CC_COMP} ]] && is_cross_compiler ; then conf="${conf}-${CC_COMP}" fi @@ -566,8 +566,7 @@ if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then fi if [[ -z ${CC_COMP} ]] ; then - if get_current_profile &>/dev/null - then + if get_current_profile &>/dev/null ; then CC_COMP="$(get_current_profile)" else list_profiles |