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

libjava.exp (bytecompile_file): Use `env(SUN_JAVAC)', that defaults to javac, as Sun-javac compiler or compatible.

Browse source 
1999-07-31  Alexandre Oliva  <oliva@dcc.unicamp.br>

	* lib/libjava.exp (bytecompile_file): Use `env(SUN_JAVAC)', that
	defaults to javac, as Sun-javac compiler or compatible.
	(libjava_init): Get GCJ from environment if neither GCJ_UNDER_TEST
	nor TOOL_EXECUTABLE are set.  Set `original_ld_library_path' from
	environment.
	(libjava_arguments): Prepend `.' and `$srcdir/$subdir' to
	CLASSPATH, for `support' sources.  Search for libgcj.spec in
	`$objdir/..', by adding -B to GCJ_UNDER_TEST.  Append
	original_ld_library_path to ld_library_path.
	* libjava.mauve/mauve.exp (test_mauve): Set `env(GCJ)' from
	GCJ_UNDER_TEST, calculated just like in libjava.exp.

From-SVN: r28364
This commit is contained in:
Alexandre Oliva 1999-07-31 23:52:52 +00:00 • committed by Tom Tromey
parent 71c7a006e5
commit 5f67f48f90
3 changed files with 80 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libjava/testsuite/libjava.mauve/mauve.exp
View file

@ -49,7 +49,7 @@ proc mauve_compute_uses {aName} {
# Run all the Mauve tests.
proc test_mauve {} {
global srcdir subdir env
global srcdir objdir subdir env
if {! [info exists env(MAUVEDIR)]} then {
verbose "MAUVEDIR not set; not running Mauve tests"
@ -65,6 +65,26 @@ proc test_mauve {} {
set full_srcdir [pwd]
cd $here/mauve-build
global env
global GCJ_UNDER_TEST
global TOOL_EXECUTABLE
if ![info exists GCJ_UNDER_TEST] {
if [info exists TOOL_EXECUTABLE] {
set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
} else {
if [info exists env(GCJ)] {
set GCJ_UNDER_TEST env(GCJ)
} else {
set GCJ_UNDER_TEST "[find_gcj]"
}
}
}
# Append -B and -I so that libgcj.spec and libgcj.zip are found
# before they're installed.
set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.zip"
if {[catch {system "$env(MAUVEDIR)/configure --with-gcj"} msg]} then {
fail "Mauve configure"
verbose "configure failed with $msg"