summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-02-20 01:16:29 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-02-20 01:16:29 +0000
commit140f6fd8c6fc65a3b49769bae7277813dd2b1125 (patch)
tree6c9fc07ec0d71c6ec513fae57b527d3f5b636a89 /sys-devel
parentold (diff)
downloadhistorical-140f6fd8c6fc65a3b49769bae7277813dd2b1125.tar.gz
historical-140f6fd8c6fc65a3b49769bae7277813dd2b1125.tar.bz2
historical-140f6fd8c6fc65a3b49769bae7277813dd2b1125.zip
Don't put CTARGET_ALIASES stuff in the env.
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc-config/Manifest8
-rwxr-xr-xsys-devel/gcc-config/files/gcc-config-1.4.06
2 files changed, 7 insertions, 7 deletions
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index cdee07523efb..e38e6d6d4e9a 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -12,14 +12,14 @@ MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545
MD5 ee3f55895cd7d8bc97f6903961a5491b files/wrapper-1.4.5.c 10671
MD5 3d37d08bd6d1d828ea19572c0c381032 files/gcc-config-1.3.10 13233
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r1 0
-MD5 2b1da89f57a6e4a1ecc57fc79a51bb7f files/gcc-config-1.4.0 14617
+MD5 4d98880cd4c884130e0d3a7ee59c9691 files/gcc-config-1.4.0 14620
MD5 b896b5ba2fa0766e410adf13ecc8048e files/wrapper-1.4.6.c 10526
MD5 d3cceaad0e9b9d7f544d792ba493909a files/fake-ctarget.sh 82
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0 0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFCFw8bArHZZzCEUG0RAv2MAJ9Vn4zuw34TwGYyevhxzGBg3ShKZQCdFWVw
-97I9JT+U9DL2pchr3yb56d0=
-=xDo3
+iD8DBQFCF+UiArHZZzCEUG0RAlUOAJkBAWQowF2lj/jvxSh3Ibfzi51NcwCeLBci
+9PE5Ej04ZCMFICvjbDpI82A=
+=uDmi
-----END PGP SIGNATURE-----
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 68028c452583..06fdce677641 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-2004 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.1 2005/02/19 10:04:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.2 2005/02/20 01:16:29 eradicator Exp $
# Author: Martin Schlemmer <azarah@gentoo.org>
trap ":" INT QUIT TSTP
@@ -160,7 +160,7 @@ switch_profile() {
echo "CURRENT=${CC_COMP}" > "${CONFIG_FILE}"
else
# Pass all by default
- ${AWK} '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS)=/ {print $0}' \
+ ${AWK} '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS|CFLAGS)=/ {print $0}' \
"${GCC_ENV_D}/${CC_COMP}" > "${ENV_FILE}"
echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_FILE}"
if [[ -n ${GCC_SPECS} ]] && [[ -e ${ROOT}/${GCC_SPECS} ]] ; then
@@ -242,7 +242,7 @@ switch_profile() {
touch -r ${ref} ${ROOT}/usr/bin/${CTARGET}-${x}
local cctarget
- for cctarget in ${GCC_CTARGET_ALIASES}; do
+ for cctarget in ${CTARGET_ALIASES}; do
local var="CFLAGS_"${cctarget//-/_}
if [[ ! -f ${GCC_ENV_D}/config-${cctarget} ]]; then
sed -e "s:@@EXEC@@:${CTARGET}-${x}:g" \