diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-11 00:01:11 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-11 00:01:11 +0000 |
| commit | 8417a6c0a5d41085029bdf71d62348f20422e110 (patch) | |
| tree | e6ca698b2a17297708c8d08ad0ef0421517ca6e3 /libjava | |
| parent | 190f8a066c5d32f3e3f06c7848a3539a4bbae448 (diff) | |
| download | gcc-8417a6c0a5d41085029bdf71d62348f20422e110.tar.gz | |
2002-02-10 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* lib/libjava.exp (libjava_find_lib): Remove duplicate .la files.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49659 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 <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 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 |