libmudflap.exp: Fix multilib problems

[Andreas Jaeger <aj at suse dot de>]

Running the testsuite with multilibs (using my previous patch), I see
lots of failures in libmudflap since the wrong libraries are used.
The appended patch fixes the problems I noticed.

Tested on Linux/AMD64.  Ok to commit?

Andreas

2004-05-30  Andreas Jaeger  <aj@suse.de>

	* testsuite/lib/libmudflap.exp (libmudflap-init): Handle
	multilibs, using multilib directory instead of hardcoded path.
	Set LD_RUN_PATH.

Index: libmudflap.exp
===================================================================
RCS file: /cvs/gcc/gcc/libmudflap/testsuite/lib/libmudflap.exp,v
retrieving revision 1.3
diff -u -p -r1.3 libmudflap.exp
--- libmudflap.exp	17 May 2004 20:34:19 -0000	1.3
+++ libmudflap.exp	30 May 2004 08:42:07 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ proc libmudflap-init { language } {
     }
     append ld_library_path ":${blddir}/.libs"
 
-    set libs "-L../.libs -L../../../gcc"
+    set libs "-L${blddir}/.libs"
     set cxxflags "-ggdb3 -DDEBUG_ASSERT"
     set includes "-I${srcdir} -I.."
 
@@ -87,7 +87,7 @@ proc libmudflap-init { language } {
             # c++ libs are included by --build-cxx below
             set cxx "[exec sh $cxxflags_file --build-cxx]"
         } else {
-            lappend libs "-L../../libstdc++-v3/src/.libs"
+            lappend libs "-L${cxxblddir}src/.libs"
             lappend includes "-I../../libstdc++-v3/include"
         }
     }
@@ -95,6 +95,7 @@ proc libmudflap-init { language } {
     verbose -log "ld_library_path=$ld_library_path"
     setenv  LD_LIBRARY_PATH     $ld_library_path
     setenv  SHLIB_PATH          $ld_library_path
+    setenv  LD_RUN_PATH         $ld_library_path
     setenv  LD_LIBRARYN32_PATH  $ld_library_path
     setenv  LD_LIBRARY64_PATH   $ld_library_path
 

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux AG, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature