diff options
| author | Ranjit Mathew <rmathew@hotmail.com> | 2003-04-26 04:01:47 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-04-26 04:01:47 +0000 |
| commit | 04ab0b3e0989aa8f142f3cdb6402724f5d13ab55 (patch) | |
| tree | 5bd855a04c92854910193d8f4fa88766bc6048f1 | |
| parent | 09e4ab56db3d8f23bcf41da17d1e6e96561e096a (diff) | |
| download | gcc-04ab0b3e0989aa8f142f3cdb6402724f5d13ab55.zip gcc-04ab0b3e0989aa8f142f3cdb6402724f5d13ab55.tar.gz gcc-04ab0b3e0989aa8f142f3cdb6402724f5d13ab55.tar.bz2 | |
testsuite_flags.in: Guard against the possibility of having "xgcc" as a part of a folder name in...
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 4 | ||||
| -rwxr-xr-x | libstdc++-v3/testsuite_flags.in | 4 |
4 files changed, 15 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c0afcf5..cfbb11a 100644 --- 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 ce598d3..daf04ce 100644 --- 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 fde593e..0e15995 100644 --- 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 4694be8..568650d 100755 --- 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) |