Fri Nov 24 11:25:20 2000 Anthony Green <green@redhat.com>

	* lib/libjava.exp (bytecompile_file): Change default from javac to
 	gcj -C.
	(libjava_arguments): Fix classpath.

	* libjava.compile/PR129_B.no-link: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37719 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 4 insertions, 3 deletions

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 0fd48d8046e..30313660466 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -49,6 +49,7 @@ proc find_gcjh {} {
 proc bytecompile_file { file objdir {classpath {}} } {
     global env
     global SUN_JAVAC
+    global GCJ_UNDER_TEST
     set dirname [file dirname $file]
 
     # If JDK doesn't run on your platform but some other
@@ -63,7 +64,7 @@ proc bytecompile_file { file objdir {classpath {}} } {
 	if [info exists env(SUN_JAVAC)] {
 	    set SUN_JAVAC $env(SUN_JAVAC)
 	} else {
-	    set SUN_JAVAC "javac"
+	    set SUN_JAVAC "$GCJ_UNDER_TEST -C"
 	}
     }
 
@@ -240,9 +241,9 @@ proc libjava_arguments {{mode compile}} {
     setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
 
     # Set the CLASSPATH environment variable
-    verbose "CLASSPATH is .:$srcdir/$subdir:$objdir/..:$objdir/../libgcj.zip"
+    verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip"
     global env
-    set env(CLASSPATH) ".:$srcdir/$subdir:$objdir/..:$objdir/../libgcj.zip"
+    set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip"
 
     global wrapper_file wrap_compile_flags;
     lappend args "additional_flags=$wrap_compile_flags";