procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/18104 (Incorrect CLASSPATH separator in libjava breaks bootstrap)

Browse source 
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
This commit is contained in:
Aaron W. LaFramboise 2004-10-26 20:43:43 -06:00 • committed by Aaron W. LaFramboise
parent a5201a9197
commit 349e19d4e8
9 changed files with 99 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libjava/testsuite/lib/libjava.exp
View file

@ -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