2003-04-25  Ranjit Mathew  <rmathew@hotmail.com>
            Phil Edwards  <pme@gcc.gnu.org>

	* testsuite_flags.in: Guard against the possibility
	of having "xgcc" as a part of a folder name in the
	path to the GCC build folder.
	* testsuite/Makefile.am: Likewise.
	* testsuite/Makefile.in: Regenerated.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66098 138bc75d-0d04-0410-961f-82ee72b054a4

libstdc++-v3/ChangeLog

+2003-04-25  Ranjit Mathew  <rmathew@hotmail.com>
+            Phil Edwards  <pme@gcc.gnu.org>
+	
+	* testsuite_flags.in: Guard against the possibility
+	of having "xgcc" as a part of a folder name in the
+	path to the GCC build folder.
+	* testsuite/Makefile.am: Likewise.
+	* testsuite/Makefile.in: Regenerated.
+	
 2003-04-25  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/10132

libstdc++-v3/testsuite/Makefile.am

@@ -38,8 +38,8 @@ RUNTESTFLAGS =
 
 ## CXX is actually a "C" compiler. These are real C++ programs.
 ## Do the same thing as `testsuite_flags --build-cxx`
-CXX_fake = @glibcpp_CXX@ 
-CXX=`echo $(CXX_fake) | sed 's/xgcc/g++/g'`
+CXX_build = @glibcpp_CXX@ 
+CXX=`echo "$(CXX_build)" | sed 's,gcc/xgcc ,gcc/g++ ,'`
 CXXLINK = \
 	LD_RUN_PATH=${LD_RUN_PATH:+$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\
 	$(LIBTOOL) --tag=CXX --mode=link $(CXX) \

libstdc++-v3/testsuite/Makefile.in

@@ -160,8 +160,8 @@ RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
 AM_RUNTESTFLAGS = 
 RUNTESTFLAGS = 
 
-CXX_fake = @glibcpp_CXX@ 
-CXX = `echo $(CXX_fake) | sed 's/xgcc/g++/g'`
+CXX_build = @glibcpp_CXX@ 
+CXX = `echo "$(CXX_build)" | sed 's,gcc/xgcc ,gcc/g++ ,'`
 CXXLINK = \
 	LD_RUN_PATH=${LD_RUN_PATH:+$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\
 	$(LIBTOOL) --tag=CXX --mode=link $(CXX) \

libstdc++-v3/testsuite_flags.in

@@ -44,8 +44,8 @@ case ${query} in
       ;;
     --build-cxx)
       PCHFLAGS="-include bits/stdc++.h"
-      CC_build="@glibcpp_CXX@ ${PCHFLAGS}"
-      CXX=`echo $CC_build | sed 's/xgcc/g++/g'`
+      CXX_build="@glibcpp_CXX@ ${PCHFLAGS}"
+      CXX=`echo "$CXX_build" | sed 's,gcc/xgcc ,gcc/g++ ,'`
       echo ${CXX}
       ;;
     --cxxflags)