diff options
| author | Aaron W. LaFramboise <aaronavay62@aaronwl.com> | 2004-10-26 20:43:43 -0600 |
|---|---|---|
| committer | Aaron W. LaFramboise <aaronwl@gcc.gnu.org> | 2004-10-26 20:43:43 -0600 |
| commit | 349e19d4e873c113b0287b68cbae1f27ba669db2 (patch) | |
| tree | f38dcf8a44fbeff2739a42be4ce2a3c87bc3f42c /libjava/testsuite/lib | |
| parent | a5201a9197a9083b71098914c9dfd97249db5249 (diff) | |
| download | gcc-349e19d4e873c113b0287b68cbae1f27ba669db2.zip gcc-349e19d4e873c113b0287b68cbae1f27ba669db2.tar.gz gcc-349e19d4e873c113b0287b68cbae1f27ba669db2.tar.bz2 | |
re PR libgcj/18104 (Incorrect CLASSPATH separator in libjava breaks bootstrap)
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.
----------------------------------------------------------------------
From-SVN: r89628
Diffstat (limited to 'libjava/testsuite/lib')
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index bc46ecf..8c79199 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 |