From 0a11e6ee782ada56c3f630d7bf050b52661f29f9 Mon Sep 17 00:00:00 2001
From: aaronwl <aaronwl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 27 Oct 2004 02:43:43 +0000
Subject: 	PR libgcj/18104 	* Makefile.am (CLASSPATH_SEPARATOR):
 Use instead of a 	colon. 	* Makefile.in: Regenerate. 	* configure:
 Regenerate. 	* configure.ac (CLASSPATH_SEPARATOR): Define. 	*
 gcj/Makefile.in: Regenerate. 	* include/Makefile.in: Regenerate. 	*
 testsuite/Makefile.in: Regenerate. 	* testsuite/lib/libjava.exp
 (libjava_arguments): Fix 	CLASSPATH separator handling for Windows.
 ----------------------------------------------------------------------

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89628 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/testsuite/lib/libjava.exp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'libjava/testsuite/lib/libjava.exp')

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index bc46ecf4f24..8c79199c614 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -332,6 +332,7 @@ proc libjava_arguments {{mode compile}} {
     global tool_root_dir
     global libgcj_jar
     global libjava_libgcc_s_path
+    global target_triplet
 
     if [info exists LIBJAVA] {
 	set libjava $LIBJAVA;
@@ -370,10 +371,18 @@ proc libjava_arguments {{mode compile}} {
 
     verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
 
+    # Determine CLASSPATH separator
+    if { [string match "i?86-pc-mingw32*" $target_triplet] } {
+	set sep ";"
+    } else {
+	set sep ":"
+    }
+
     # Set the CLASSPATH environment variable
-    verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$libgcj_jar"
     global env
-    set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$libgcj_jar"
+    set env(CLASSPATH) \
+	[join [list . $srcdir/$subdir $objdir $libgcj_jar] $sep]
+    verbose "CLASSPATH is $env(CLASSPATH)"
 
     if {$mode == "link"} {
 	global wrapper_file wrap_compile_flags
-- 
cgit v1.2.3