From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 5 Dec 2004 21:07:43 +0000 (+0000)
Subject: make sure we delete /lib/cpp if no C++ support
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=311ee119882bb5404c9bdc481dc92e68b081699e;p=gentoo.git

make sure we delete /lib/cpp if no C++ support
---

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index acd7f39ed24b..cfd2f9579860 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b912b6ff088d9ea18327c905dc2282b2 gcc-config-1.3.7-r5.ebuild 1427
 MD5 eada6d619ecaf729aa80d194fcebb102 ChangeLog 13350
 MD5 0a250a07d02f1343f64fe7f7bbdbd820 gcc-config-1.3.6-r4.ebuild 2636
@@ -8,13 +5,6 @@ MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r4 0
 MD5 2902e905147ff6ba0703f0f72660aa9a files/wrapper-1.4.3.c 8434
 MD5 5f5ba2d67203ed8386ae76352f15000d files/gcc-config-1.3.6 10285
-MD5 44a8e5590677f8daa64ade7a42dd6f61 files/gcc-config-1.3.7 11809
+MD5 17dcdbe7900659afdd8f66505c02e1dd files/gcc-config-1.3.7 11861
 MD5 e64a89abafa7f6f7d16c2540fb0edcf4 files/wrapper-1.4.2.c 7381
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r5 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBssKDroRuSHgZdywRAoLBAJ41xQc06E5jOZsHmDBS8K3m0KrOvwCfRfSc
-qHgWP6I5YMKW6Icwvqfpto8=
-=ClKE
------END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.7 b/sys-devel/gcc-config/files/gcc-config-1.3.7
index 32f133ef408a..343fce0cc79a 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.7
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.7
@@ -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.3.7,v 1.8 2004/12/05 08:10:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.7,v 1.9 2004/12/05 21:07:43 vapier Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -162,6 +162,7 @@ switch_profile() {
 	unset GCC_SPECS
 	source "${GCC_ENV_D}/${CC_COMP}"
 	OLD_CC_COMP=$(get_current_profile)
+	CTARGET="${CTARGET:-${REAL_CHOST}}"
 
 	# What kind of env.d entry are we going to generate ?
 	if is_cross_compiler
@@ -224,10 +225,13 @@ switch_profile() {
 		fi
 	done
 	# Only install cpp if the toolchain supports C++
-	if ! is_cross_compiler && [ -x "${ROOT}/usr/bin/${REAL_CHOST}-g++" ]
+	if ! is_cross_compiler
 	then
 		${RM} -f "${ROOT}/lib/cpp"
-		${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" "${ROOT}/lib/cpp"
+		if [ -x "${ROOT}/usr/bin/${REAL_CHOST}-g++" ]
+		then
+			${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" "${ROOT}/lib/cpp"
+		fi
 	fi
 
 	if [ "${ROOT}" = "/" ] && [ "${OLD_CC_COMP}" != "${CC_COMP}" ]