FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lib/libjava.exp (libjava_arguments): Handle -lzgcj.

Browse source 
From-SVN: r27721
This commit is contained in:
Tom Tromey 1999-06-23 15:14:36 +00:00 • committed by Tom Tromey
parent 2f9fb4c226
commit 09dd71fc3e
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libjava/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
1999-06-23 Tom Tromey <tromey@cygnus.com>
* lib/libjava.exp (libjava_arguments): Handle -lzgcj.
1999-05-24 Anthony Green <green@cygnus.com> 1999-05-24 Anthony Green <green@cygnus.com>
* libjava.lang/Shazam.java: New file. * libjava.lang/Shazam.java: New file.

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

@ -111,6 +111,8 @@ proc libjava_arguments {{mode compile}} {
global base_dir global base_dir
global LIBJAVA global LIBJAVA
global LIBGC global LIBGC
global LIBQTHREADS
global LIBZ
global srcdir subdir objdir global srcdir subdir objdir
global TOOL_OPTIONS global TOOL_OPTIONS
global GCJ_UNDER_TEST global GCJ_UNDER_TEST
@ -135,6 +137,12 @@ proc libjava_arguments {{mode compile}} {
set libqthreads [libjava_find_lib qthreads gcjcoop] set libqthreads [libjava_find_lib qthreads gcjcoop]
} }
if [info exists LIBZ] {
set libz $LIBZ
} else {
set libz [libjava_find_lib zlib zgcj]
}
# FIXME: there's no way to determine whether -lpthread is # FIXME: there's no way to determine whether -lpthread is
# required. We should get this info from configure, or it should # required. We should get this info from configure, or it should
# just be in the compiler driver. # just be in the compiler driver.
@ -142,6 +150,7 @@ proc libjava_arguments {{mode compile}} {
verbose "using LIBJAVA = $libjava" 2 verbose "using LIBJAVA = $libjava" 2
verbose "using LIBGC = $libgc" 2 verbose "using LIBGC = $libgc" 2
verbose "using LIBQTHREADS = $libqthreads" 2 verbose "using LIBQTHREADS = $libqthreads" 2
verbose "using LIBZ = $libz" 2
set args "" set args ""
# Basically we want to build up a colon separated path list from # Basically we want to build up a colon separated path list from
@ -178,6 +187,7 @@ proc libjava_arguments {{mode compile}} {
lappend args "libs=$libjava"; lappend args "libs=$libjava";
lappend args "libs=$libgc"; lappend args "libs=$libgc";
lappend args "libs=$libqthreads" lappend args "libs=$libqthreads"
lappend args "libs=$libz"
lappend args debug lappend args debug
if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } { if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } {