bootstrap/4113: 3.0.1 build dies in libstdc++-v3/include (various platforms)

[Will Partain]

>Number:         4113
>Category:       bootstrap
>Synopsis:       3.0.1 build dies in libstdc++-v3/include (various platforms)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    unassigned
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 24 04:06:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Will Partain
>Release:        3.0.1
>Organization:
>Environment:
System: SunOS slicker 5.6 Generic_105181-25 sun4u sparc SUNW,Ultra-5_10
Architecture: sun4

	
host: sparc-sun-solaris2.6
build: sparc-sun-solaris2.6
target: sparc-sun-solaris2.6
configured with: ./configure --prefix=/.-ark-deploy/gcc--3.0.1 --enable-languages=c,c++ --disable-nls : (reconfigured) ./configure --prefix=/.-ark-deploy/gcc--3.0.1 --enable-languages=c,c++ --disable-nls
>Description:
	'make bootstrap' fails in libstdc++-v3/include, because
	of a file-not-found problem (see diffs below).  It
	*may* be something about my local environment, but it is
	less than obvious what that might be.
>How-To-Repeat:
	
>Fix:
	This patch works for me.

diff -ru2 ../gcc-3.0.1/libstdc++-v3/include/Makefile.am ./libstdc++-v3/include/Makefile.am
--- ../gcc-3.0.1/libstdc++-v3/include/Makefile.am	Sat Aug 18 06:03:40 2001
+++ ./libstdc++-v3/include/Makefile.am	Fri Aug 24 09:54:52 2001
@@ -400,10 +400,10 @@
 	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
-	    < ${glibcpp_srcdir}/../gcc/gthr.h > $@
+	    < ${glibcpp_srcdir}/../../gcc/gthr.h > $@
 
 ${thread_builddir}/gthr-single.h:
 	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
 	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-	    < ${glibcpp_srcdir}/../gcc/gthr-single.h > $@
+	    < ${glibcpp_srcdir}/../../gcc/gthr-single.h > $@
 
 ${thread_builddir}/gthr-default.h:
@@ -411,5 +411,5 @@
 	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
 	    -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
-	    < ${glibcpp_srcdir}/../gcc/${glibcpp_thread_h} > $@
+	    < ${glibcpp_srcdir}/../../gcc/${glibcpp_thread_h} > $@
 
 # One big happy istallation:  just copy everything from the build to the
diff -ru2 ../gcc-3.0.1/libstdc++-v3/include/Makefile.in ./libstdc++-v3/include/Makefile.in
--- ../gcc-3.0.1/libstdc++-v3/include/Makefile.in	Sat Aug 18 06:02:27 2001
+++ ./libstdc++-v3/include/Makefile.in	Fri Aug 24 09:54:52 2001
@@ -378,10 +378,10 @@
 	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
-	    < ${glibcpp_srcdir}/../gcc/gthr.h > $@
+	    < ${glibcpp_srcdir}/../../gcc/gthr.h > $@
 
 ${thread_builddir}/gthr-single.h:
 	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
 	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-	    < ${glibcpp_srcdir}/../gcc/gthr-single.h > $@
+	    < ${glibcpp_srcdir}/../../gcc/gthr-single.h > $@
 
 ${thread_builddir}/gthr-default.h:
@@ -389,5 +389,5 @@
 	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
 	    -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
-	    < ${glibcpp_srcdir}/../gcc/${glibcpp_thread_h} > $@
+	    < ${glibcpp_srcdir}/../../gcc/${glibcpp_thread_h} > $@
 
 install-data-local:
>Release-Note:
>Audit-Trail:
>Unformatted: