From: Daniel Jacobowitz <drow@false.org>
Date: Mon, 6 Jul 2009 19:14:01 +0000 (+0000)
Subject: 	* lib/java.exp (java_init): Ignore $GCJ if it is empty.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d80a43f9615fd7a29c00083e214d2b5053db0500;p=binutils-gdb.git

	* lib/java.exp (java_init): Ignore $GCJ if it is empty.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c118286b36d..7b2d8202ea7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* lib/java.exp (java_init): Ignore $GCJ if it is empty.
+
 2009-07-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* lib/gdbserver-support.exp (gdbserver_start): Loop spawning
diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
index c92fc3707fb..19619df6bfa 100644
--- a/gdb/testsuite/lib/java.exp
+++ b/gdb/testsuite/lib/java.exp
@@ -45,7 +45,7 @@ proc java_init { args } {
 	if [info exists TOOL_EXECUTABLE] {
 	    set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
 	} else {
-	    if [info exists env(GCJ)] {
+	    if { [info exists env(GCJ)] && $env(GCJ) != "" } {
 		set GCJ_UNDER_TEST $env(GCJ)
 	    } else {
 		global tool_root_dir