libstdc++-v3-dg.exp (libstdc++-v3_target_compile): Search correct multilib testsuite...

	* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3_target_compile):
	Search correct multilib testsuite dir for libv3test.

From-SVN: r54256

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e1ea9e1e65ab1f52d8bb5cbe85fc954d334cf3cf..e52bafa90d1e4fe35a48ded33d13f5f9a8337841 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-04  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3_target_compile):
+       Search correct multilib testsuite dir for libv3test.
+
 2002-06-04  Paolo Carlini  <pcarlini@unitus.it>
             Gaby Dos Reis  <gdr@codesourcery.com>
 

diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
index 74a913cd983c5cffdc601d7c5b3649df0a8780f1..fd95a0d9253d7c3d888e44304ba9759788f28b31 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
@@ -185,6 +185,7 @@ proc libstdc++-v3_target_compile { source dest type options } {
     global cxx
     global cxxflags
     global includes
+    global blddir
 
     if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
        lappend options "libs=${gluefile}"
@@ -199,9 +200,9 @@ proc libstdc++-v3_target_compile { source dest type options } {
 
     lappend options "compiler=$cxx_final"
 
-    # Picks up our local freshly-built testsuite library.  We could just
-    # name it directly, "./libv3test.a" but this is more portable.
-    lappend options "ldflags=-L."
+    # Picks up the freshly-built testsuite library corresponding to the
+    # multilib under test.
+    lappend options "ldflags=-L${blddir}/testsuite"
     lappend options "libs=-lv3test"
 
     return [target_compile $source $dest $type $options]