libstdc++-v3 make check and multilibs

[Billinghurst, David (CRTS)]

libstdc++-v3 "make check" doesn't work with multilibs, see
http://gcc.gnu.org/ml/libstdc++/2000-11/msg00176.html

This patch fixes the path for CXX using MULTIBUILDTOP.  Very ugly.  Is there
another way to determine MULTIBUILDTOP?

Bootstrapped on cygwin.  NOT bootstrapped on irix, as I have some version
skew in autotools, but it seems to do the right thing.

2001-01-12  David Billinghurst <David.Billinghurst@riotinto.com>

	* tests_flags.in:  Define MULTIBUILDTOP.  Use it for CXX
	* configure.in: Determine MULTIBUILDTOP and substitute into
tests_flags

Index: libstdc++-v3/configure.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure.in,v
retrieving revision 1.47
diff -c -r1.47 configure.in
*** configure.in	2001/01/08 17:53:52	1.47
--- configure.in	2001/01/12 04:04:05
***************
*** 301,310 ****
--- 301,314 ----
  # place. To work around this not being passed down from config-ml.in
  # -> top_srcdir/Makefile.am -> top_srcdir/src/Makefile.am, manually
  # append it here.
+ # Also need to manually substitute MULTIBUILDTOP in tests_flags
  AC_OUTPUT(tests_flags mkcheck Makefile src/Makefile libmath/Makefile
libio/Makefile libsupc++/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
    grep '^MULTISUBDIR =' Makefile >> src/Makefile
+   MULTIBUILDTOP=`awk '/^MULTIBUILDTOP =/ {print $[3]}' Makefile`
+   sed "s%@MULTIBUILDTOP@%${MULTIBUILDTOP}%" tests_flags > tests_flags.new
+   mv tests_flags.new tests_flags
  fi
  chmod +x tests_flags
  chmod +x mkcheck
Index: libstdc++-v3/tests_flags.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/tests_flags.in,v
retrieving revision 1.7
diff -c -r1.7 tests_flags.in
*** tests_flags.in	2001/01/01 23:14:43	1.7
--- tests_flags.in	2001/01/12 04:04:06
***************
*** 133,140 ****
  # CXX == how to call the compiler
  case ${query} in
      --built-library)
      LIB_PATH=${BUILD_DIR}/src
!     CXX="${BUILD_DIR}/../../gcc/g++ -B${BUILD_DIR}/../../gcc/"
      ;;
      --installed-library)
      LIB_PATH=${PREFIX_DIR}/lib
--- 133,142 ----
  # CXX == how to call the compiler
  case ${query} in
      --built-library)
+     MULTIBUILDTOP=@MULTIBUILDTOP@
      LIB_PATH=${BUILD_DIR}/src
!     CXX="${BUILD_DIR}/../../${MULTIBUILDTOP}gcc/g++ 
!        -B${BUILD_DIR}/../../${MULTIBUILDTOP}gcc/"
      ;;
      --installed-library)
      LIB_PATH=${PREFIX_DIR}/lib