libjava.exp (libjava_find_lib): Remove duplicate .la files.

2002-02-10  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* lib/libjava.exp (libjava_find_lib): Remove duplicate .la files.

From-SVN: r49659

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index a0bc66c36d723d1d5316ad3ad99ce933dacb1b4f..bf0178673d3b8c0926868a3284287223d2884f26 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-10  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * lib/libjava.exp (libjava_find_lib): Remove duplicate .la files.
+
 2002-01-05  H.J. Lu <hjl@gnu.org>
 
        * libjava.jni/jni.exp: Add -I.. for generated header.

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 9b45f3c16662b50c51f4c977a72376a86e06fc77..67f9b6eea255caed3f43d485baa920cb4eacf90e 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
+# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation
 
 load_lib "libgloss.exp"
 
@@ -175,11 +175,15 @@ proc libjava_find_lib {dir name} {
     foreach sub {.libs _libs} {
        if {$gp != ""} {
            if {[file exists $gp/$dir/$sub/lib${name}.a]} then {
-               return "$gp/$dir/lib${name}.la -L$gp/$dir/$sub"
+               # Just return the `-L' option.  The library itself
+               # will be picked up via the spec file.
+               return "-L$gp/$dir/$sub"
            }
        }
+       # Just return the `-L' option.  The library itself will be
+       # picked up via the spec file.
        set lib [findfile $base_dir/../../$dir/$sub/lib${name}.a \
-                  "$base_dir/../../$dir/lib${name}.la -L$base_dir/../../$dir/$sub" \
+                  "-L$base_dir/../../$dir/$sub" \
                   ""]
        if {$lib != ""} {
            return $lib