From 96b9910446b528963ae7894faee9a3e29b782d5a Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Mon, 11 Feb 2002 00:01:11 +0000 Subject: [PATCH] libjava.exp (libjava_find_lib): Remove duplicate .la files. 2002-02-10 Rainer Orth * lib/libjava.exp (libjava_find_lib): Remove duplicate .la files. From-SVN: r49659 --- libjava/testsuite/ChangeLog | 4 ++++ libjava/testsuite/lib/libjava.exp | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index a0bc66c36d7..bf0178673d3 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-02-10 Rainer Orth + + * lib/libjava.exp (libjava_find_lib): Remove duplicate .la files. + 2002-01-05 H.J. Lu * libjava.jni/jni.exp: Add -I.. for generated header. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 9b45f3c1666..67f9b6eea25 100644 --- 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