have gcc-config create the 32bit/64bit wrappers

1 files changed, 7 insertions, 36 deletions

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 495d786a33f9..48e2046c4aa7 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.36 2004/10/25 23:24:21 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.37 2004/10/26 04:09:02 vapier Exp $
 #
 # This eclass should contain general toolchain-related functions that are
 # expected to not change, or change much.
@@ -868,7 +868,7 @@ gcc_do_configure() {
 
 	# Incredibly theoretical cross-compiler support
 	confgcc="${confgcc} --host=${CHOST}"
-	if [ "${CTARGET}" != "${CHOST}" -a "${CTARGET}" != "" ] ; then
+	if [ "${CTARGET}" != "${CHOST}" ] ; then
 		# Straight from the GCC install doc:
 		# "GCC has code to correctly determine the correct value for target 
 		# for nearly all native systems. Therefore, we highly recommend you
@@ -914,7 +914,6 @@ gcc_do_configure() {
 		--disable-checking \
 		--disable-werror \
 		--disable-libunwind-exceptions \
-		--with-gnu-ld \
 		--enable-threads=posix"
 
 	# default arch support
@@ -1031,39 +1030,6 @@ gcc_do_make() {
 }
 
 
-create_gcc_multilib_scripts() {
-	mkdir -p ${D}/${BINPATH}/
-	mkdir -p ${D}/usr/bin/
-
-	if has_m32 ; then
-
-		echo -e '#!/bin/sh \nexec '"/${BINPATH}/${CHOST}-gcc -m32 "'"$@"' \
-			> ${D}/${BINPATH}/${CHOST}-gcc32-${PV}
-		chmod +x ${D}/${BINPATH}/${CHOST}-gcc32-${PV}
-		ln -s ../../${BINPATH}/${CHOST}-gcc32-${PV} ${D}/usr/bin/gcc32
-
-		echo -e '#!/bin/sh \nexec '"/${BINPATH}/${CHOST}-g++ -m32 "'"$@"' \
-			> ${D}/${BINPATH}/${CHOST}-g++32-${PV}
-		chmod +x ${D}/${BINPATH}/${CHOST}-g++32-${PV}
-		ln -s ../../${BINPATH}/${CHOST}-g++32-${PV} ${D}/usr/bin/g++32
-
-	fi
-	if has_m64 ; then
-
-		echo -e '#!/bin/sh \nexec '"/${BINPATH}/${CHOST}-gcc -m64 "'"$@"' \
-			> ${D}/${BINPATH}/${CHOST}-gcc64-${PV}
-		chmod +x ${D}/${BINPATH}/${CHOST}-gcc64-${PV}
-		ln -s ../../${BINPATH}/${CHOST}-gcc64-${PV} ${D}/usr/bin/gcc64
-
-		echo -e '#!/bin/sh \nexec '"/${BINPATH}/${CHOST}-g++ -m64 "'"$@"' \
-			> ${D}/${BINPATH}/${CHOST}-g++64-${PV}
-		chmod +x ${D}/${BINPATH}/${CHOST}-g++64-${PV}
-		ln -s ../../${BINPATH}/${CHOST}-g++64-${PV} ${D}/usr/bin/g++64
-
-	fi
-}
-
-
 # This function will add ${PV} to the names of all shared libraries in the
 # directory specified to avoid filename collisions between multiple slotted 
 # non-versioned gcc targets. If no directory is specified, it is assumed that
@@ -1219,6 +1185,11 @@ create_gcc_env_entry() {
 		done
 	fi
 
+	local mbits=
+	has_m32 && mbits="${mbits} 32"
+	has_m64 && mbits="${mbits} 64"
+	echo "GCCBITS=\"${mbits}\"" >> ${gcc_envd_file}
+
 	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
 	echo "MANPATH=\"${DATAPATH}/man\"" >> ${gcc_envd_file}
 	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${gcc_envd_file}