testsuite_flags.in: Guard against the possibility of having "xgcc" as a part of a...

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.

Co-Authored-By: Phil Edwards <pme@gcc.gnu.org>
From-SVN: r66098

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c0afcf5d0d12ddc03d42aef04392eb935da5dd10..cfbb11aa29a1fc771e19d4fc5ee77c24f1b23aaf 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index ce598d3b581653daff70a50e2b0bdc62ef86455a..daf04ce54e4436301ac86ae14ca025feeff25de7 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/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) \

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index fde593ebf851733cd8147e84aeebc811a7358a0e..0e15995ab17416c21b2de3972527cb1745e045a9 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/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) \

diff --git a/libstdc++-v3/testsuite_flags.in b/libstdc++-v3/testsuite_flags.in
index 4694be8cd029b40b96307186e5f56f1dd9240f0a..568650dc5109dc46d5e24c28ab8b2411cc6a1a0a 100755 (executable)
--- a/libstdc++-v3/testsuite_flags.in
+++ b/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)