diff options
| author | John David Anglin <dave.anglin@nrc-cnrc.gc.ca> | 2004-11-26 00:18:02 +0000 |
|---|---|---|
| committer | John David Anglin <danglin@gcc.gnu.org> | 2004-11-26 00:18:02 +0000 |
| commit | f7fdebfbf63d6f9627ae2cfeeb9bb00766664b2a (patch) | |
| tree | 07bf8ddafe79c50ab3104e98fd6f5a29361bf3aa /libjava/testsuite | |
| parent | 3a4e7e8f5d6751684fbe94e145b58391e1e182c1 (diff) | |
| download | gcc-f7fdebfbf63d6f9627ae2cfeeb9bb00766664b2a.zip gcc-f7fdebfbf63d6f9627ae2cfeeb9bb00766664b2a.tar.gz gcc-f7fdebfbf63d6f9627ae2cfeeb9bb00766664b2a.tar.bz2 | |
libjava.exp (libjava_arguments): Add new global variable libjava_ld_library_path.
* testsuite/lib/libjava.exp (libjava_arguments): Add new global
variable libjava_ld_library_path.
(gcj_invoke, libjava_invoke): Use it to set ld_library_path.
From-SVN: r91314
Diffstat (limited to 'libjava/testsuite')
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 955f68a..62b1f46 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -323,6 +323,7 @@ proc libjava_arguments {{mode compile}} { global tool_root_dir global libgcj_jar global libjava_libgcc_s_path + global libjava_ld_library_path global ld_library_path global target_triplet @@ -338,7 +339,7 @@ proc libjava_arguments {{mode compile}} { # Basically we want to build up a colon separated path list from # the value of $libjava. - set lpath {} + set lpath "." foreach dir [list $libjava] { foreach item [split $dir " "] { switch -glob -- $item { @@ -352,6 +353,7 @@ proc libjava_arguments {{mode compile}} { set lpath [concat $lpath $libjava_libgcc_s_path] verbose "lpath = $lpath ; libgcc_s_path = $libjava_libgcc_s_path" set ld_library_path [join $lpath :] + set libjava_ld_library_path "$ld_library_path" # That's enough to make things work for the normal case. # If we wanted to handle an arbitrary value of libjava, @@ -453,9 +455,10 @@ proc gcj_link {program main files {options {}}} { # Invoke the program and see what happens. Return 0 on failure. proc gcj_invoke {program expectFile ld_library_additions} { global env + global libjava_ld_library_path global ld_library_path - set ld_library_path . + set ld_library_path "$libjava_ld_library_path" if {[llength $ld_library_additions] > 0} { append ld_library_path :[join $ld_library_additions :] } @@ -498,9 +501,10 @@ proc gcj_invoke {program expectFile ld_library_additions} { proc libjava_invoke {errname testName optName executable inpfile resultfile ld_library_additions args} { global env + global libjava_ld_library_path global ld_library_path - set ld_library_path . + set ld_library_path "$libjava_ld_library_path" if {[llength $ld_library_additions] > 0} { append ld_library_path :[join $ld_library_additions :] } |