This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [PING] Windows patches.
- From: "Aaron W. LaFramboise" <aaronavay62 at aaronwl dot com>
- To: tromey at redhat dot com
- Cc: Gcc Patch List <gcc-patches at gcc dot gnu dot org>, java-patches at gcc dot gnu dot org
- Date: Mon, 25 Oct 2004 17:01:43 -0500
- Subject: Re: [PING] Windows patches.
- References: <417AB82F.4030405@aaronwl.com> <m3acudout2.fsf@localhost.localdomain>
Tom Tromey wrote:
> You may want/need to patch the test suite as well. (I didn't look to
> see if it is necessary.)
I found one place with a CLASSPATH separator in the testsuite. I've
started a bootstrap/test cycle with it, which might take a while. Is
this OK, assuming it passes the tests?
Aaron W. LaFramboise
2004-10-25 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
* testsuite/lib/libjava.exp (libjava_arguments): Fix CLASSPATH
separator handling for Windows.
Index: gcc/libjava/testsuite/lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.59
diff -c -3 -p -r1.59 libjava.exp
*** gcc/libjava/testsuite/lib/libjava.exp 4 Aug 2004 16:49:21 -0000 1.59
--- gcc/libjava/testsuite/lib/libjava.exp 25 Oct 2004 06:56:08 -0000
*************** proc libjava_arguments {{mode compile}}
*** 332,337 ****
--- 332,338 ----
global tool_root_dir
global libgcj_jar
global libjava_libgcc_s_path
+ global target_triplet
if [info exists LIBJAVA] {
set libjava $LIBJAVA;
*************** proc libjava_arguments {{mode compile}}
*** 370,379 ****
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
# Set the CLASSPATH environment variable
! verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$libgcj_jar"
global env
! set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$libgcj_jar"
if {$mode == "link"} {
global wrapper_file wrap_compile_flags
--- 371,387 ----
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 .$sep$srcdir/$subdir$sep$objdir$sep$libgcj_jar"
global env
! set env(CLASSPATH) ".$sep$srcdir/$subdir$sep$objdir$sep$libgcj_jar"
if {$mode == "link"} {
global wrapper_file wrap_compile_flags