FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libjava.exp (libjava_arguments): Rewrote computation of LD_LIBRARY_PATH.

Browse source 
* lib/libjava.exp (libjava_arguments): Rewrote computation of
	LD_LIBRARY_PATH.  Add gcc build directory if it contains
	libgcc_s.so.

From-SVN: r40564
This commit is contained in:
Tom Tromey 2001-03-16 20:54:45 +00:00 • committed by Tom Tromey
parent 2d6eb5bf63
commit d19c968978
2 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2001-03-16 Tom Tromey <tromey@redhat.com>
* lib/libjava.exp (libjava_arguments): Rewrote computation of
LD_LIBRARY_PATH. Add gcc build directory if it contains
libgcc_s.so.
2001-03-14 Tom Tromey <tromey@redhat.com> 2001-03-14 Tom Tromey <tromey@redhat.com>
* libjava.compile/assignment.xfail: Removed. * libjava.compile/assignment.xfail: Removed.

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

@ -1,4 +1,4 @@
# Copyright (C) 1998, 1999, 2000 Free Software Foundation # Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
load_lib "libgloss.exp" load_lib "libgloss.exp"
@ -192,6 +192,7 @@ proc libjava_arguments {{mode compile}} {
global tmpdir global tmpdir
global runtests global runtests
global env global env
global tool_root_dir
if [info exists LIBJAVA] { if [info exists LIBJAVA] {
set libjava $LIBJAVA; set libjava $LIBJAVA;
@ -230,17 +231,25 @@ proc libjava_arguments {{mode compile}} {
# Basically we want to build up a colon separated path list from # Basically we want to build up a colon separated path list from
# the value of $libjava. # the value of $libjava.
# First strip away any -L arguments. set lpath {}
regsub -all -- "-L" $libjava "" ld_library_path foreach dir [list $libjava $libgc $libz] {
foreach item [split $dir " "] {
switch -glob -- $item {
"-L*" {
lappend lpath [string range $item 2 end]
}
}
}
}
# Then remove any -lgcj argument. # Finally, add the gcc build directory so that we can find the
regsub -all -- " -lgcj.*" $ld_library_path "" ld_library_path # shared libgcc. This, like much of dejagnu, is hideous.
set gccdir [lookfor_file $tool_root_dir gcc/libgcc_s.so]
if {$gccdir != ""} {
lappend lpath [file dirname $gccdir]
}
# First strip away any -L arguments. set ld_library_path [join $lpath :]
regsub -all -- "-L" $libgc $ld_library_path ld_library_path
# Then remove any -lgcjgc argument.
regsub -all -- " -lgcjgc.*" $ld_library_path "" ld_library_path
# That's enough to make things work for the normal case. # That's enough to make things work for the normal case.
# If we wanted to handle an arbitrary value of libjava, # If we wanted to handle an arbitrary value of libjava,
@ -251,6 +260,8 @@ proc libjava_arguments {{mode compile}} {
setenv LD_LIBRARY_PATH "$ld_library_path:$original_ld_library_path" setenv LD_LIBRARY_PATH "$ld_library_path:$original_ld_library_path"
setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path" setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
# Set the CLASSPATH environment variable # Set the CLASSPATH environment variable
verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar" verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
global env global env