libjava.exp (libjava_arguments): If `libtool' not found in build tree, just use $GCJ_UNDER_TEST as compiler.
* lib/libjava.exp (libjava_arguments): If `libtool' not found in build tree, just use $GCJ_UNDER_TEST as compiler. From-SVN: r27728
This commit is contained in:
parent
e04ea7d3eb
commit
fe574d5d92
2 changed files with 10 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
1999-06-24 Tom Tromey <tromey@cygnus.com>
|
||||||
|
|
||||||
|
* lib/libjava.exp (libjava_arguments): If `libtool' not found in
|
||||||
|
build tree, just use $GCJ_UNDER_TEST as compiler.
|
||||||
|
|
||||||
1999-06-23 Tom Tromey <tromey@cygnus.com>
|
1999-06-23 Tom Tromey <tromey@cygnus.com>
|
||||||
|
|
||||||
* lib/libjava.exp (libjava_arguments): Handle -lzgcj.
|
* lib/libjava.exp (libjava_arguments): Handle -lzgcj.
|
||||||
|
|
|
@ -200,15 +200,20 @@ proc libjava_arguments {{mode compile}} {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Search for libtool. We need it to link.
|
# Search for libtool. We need it to link.
|
||||||
|
set found_compiler 0
|
||||||
set d [absolute $objdir]
|
set d [absolute $objdir]
|
||||||
foreach x {. .. ../.. ../../..} {
|
foreach x {. .. ../.. ../../..} {
|
||||||
if {[file exists $d/$x/libtool]} then {
|
if {[file exists $d/$x/libtool]} then {
|
||||||
# We have to run silently to avoid DejaGNU lossage.
|
# We have to run silently to avoid DejaGNU lossage.
|
||||||
lappend args \
|
lappend args \
|
||||||
"compiler=$d/$x/libtool --silent --mode=$mode $GCJ_UNDER_TEST"
|
"compiler=$d/$x/libtool --silent --mode=$mode $GCJ_UNDER_TEST"
|
||||||
|
set found_compiler 1
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if {! $found_compiler} {
|
||||||
|
lappend args "compiler=$GCJ_UNDER_TEST"
|
||||||
|
}
|
||||||
|
|
||||||
return $args
|
return $args
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue