diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-04-03 01:05:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-04-03 01:05:59 +0000 |
| commit | 95b5dd1efbf0c86ef68098ee59fdfa1622318b40 (patch) | |
| tree | 1279978a99739324a328670dadea9ef24d1b464c /sys-devel/gcc-config/files | |
| parent | Add ~x86-fbsd keyword. (diff) | |
| download | historical-95b5dd1efbf0c86ef68098ee59fdfa1622318b40.tar.gz historical-95b5dd1efbf0c86ef68098ee59fdfa1622318b40.tar.bz2 historical-95b5dd1efbf0c86ef68098ee59fdfa1622318b40.zip | |
Generate a CTARGET-cpp wrapper if need be.
Package-Manager: portage-2.1_pre7-r3
Diffstat (limited to 'sys-devel/gcc-config/files')
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.3.13 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.13 b/sys-devel/gcc-config/files/gcc-config-1.3.13 index e2c8debd3bf2..39bed4049a36 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.13 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.13 @@ -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.13,v 1.3 2006/01/08 09:52:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.4 2006/04/03 01:05:59 vapier Exp $ trap ":" INT QUIT TSTP @@ -239,7 +239,7 @@ switch_profile() { # Update the wrappers for this profile local native="gcc cpp cc c++ g++ f77 g77 gcj" is_cross_compiler && native="" - for x in ${native} ${CTARGET}-{gcc,c++,g++,f77,g77,gcj} ; do + for x in ${native} ${CTARGET}-{cpp,gcc,c++,g++,f77,g77,gcj} ; do # Make sure we have no stale wrappers ${RM} -f "${ROOT}/usr/bin/${x}" [[ ${x:${#x}-3} == "gcc" || ${x:${#x}-3} == "g++" ]] \ @@ -250,9 +250,12 @@ switch_profile() { # wrapper (the binary we're 'wrapping') so that we can # sync mtimes together. This makes things like ccache # happy. See Bug #70548 for more info. - local ref=${ROOT}/${GCC_BIN_PATH}/${x} - [[ ${x} == "cc" ]] && ref=${ROOT}/${GCC_BIN_PATH}/gcc - [[ ${x} == "f77" ]] && ref=${ROOT}/${GCC_BIN_PATH}/g77 + local ref + case ${x} in + cc) ref=${ROOT}/${GCC_BIN_PATH}/gcc;; + f77) ref=${ROOT}/${GCC_BIN_PATH}/g77;; + *) ref=${ROOT}/${GCC_BIN_PATH}/${x};; + esac if [[ -x ${ref} ]] ; then ${CP} -f "${wrapper}" "${ROOT}/usr/bin/${x}" ${TOUCH} -r "${ref}" "${ROOT}/usr/bin/${x}" @@ -307,7 +310,7 @@ switch_profile() { if [[ ${ROOT} == "/" ]] && [[ ${OLD_CC_COMP} != ${CC_COMP} || ${FORCE} == "yes" ]] ; then # in case python is broken ... - if ! ${ENV_UPDATE} &>/dev/null ; then + if ! ${ENV_UPDATE} ; then echo "" ewarn "env-update failed to work properly; making sure ld.so.conf paths" ewarn "are setup properly. Please rerun gcc-config with the -f option." |