OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Rainer Orth 2002-02-11 00:01:11 +00:00 committed by Tom Tromey
parent 0b8c0d4e30
commit 96b9910446
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libjava/testsuite/ChangeLog
View File

@ -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.

10
libjava/testsuite/lib/libjava.exp
View File

@ -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