From 2fe1eb28ab5b4bf7f896faf0299046ffa95edf7a Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 10 May 2002 00:49:55 +0000
Subject: [PATCH] All platforms should be on equal footing now -- no special
 handling for Sparc64 and IA-64.

---
 gnu/lib/Makefile | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 9e3e0238f72..971934f9983 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,14 +1,6 @@
 # $FreeBSD$
 
-.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64"
-SUBDIR+= csu libgcc
-.else
-NO_CXX=	yes
-NO_OBJC=yes
-NO_FORTRAN=yes
-.endif
-
-SUBDIR+= libdialog libregex libreadline
+SUBDIR= csu libgcc libdialog libregex libreadline
 
 .if ${OBJFORMAT} == aout
 .if !defined(NOLIBC_R)
@@ -16,8 +8,12 @@ SUBDIR+= libgcc_r
 .endif
 .endif
 
+.if ${CXX:T} == "c++"
+NO_CXX=	yes
+.endif
+
 .if !defined(NO_CXX)
-SUBDIR+= libstdc++
+SUBDIR+= libsupc++ libstdc++
 .endif
 
 .if !defined(NO_OBJC)