backport: libjava.exp (libjava_arguments): Use 'file normalize' rather than the defunct DejaGnu 'absolute' proc.

2016-04-23  Dominique d'Humieres  <dominiq@lps.ens.fr>

	backport from trunk:
	2016-04-20  Ben Elliston  <bje@gnu.org>

	* testsuite/lib/libjava.exp (libjava_arguments): Use 'file
	normalize' rather than the defunct DejaGnu 'absolute' proc.

From-SVN: r235386
This commit is contained in:
Dominique d'Humieres 2016-04-23 23:38:57 +02:00 committed by Dominique d'Humieres
parent 10c7135101
commit db86612cc1
2 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2016-04-23 Dominique d'Humieres <dominiq@lps.ens.fr>
backport from trunk:
2016-04-20 Ben Elliston <bje@gnu.org>
* testsuite/lib/libjava.exp (libjava_arguments): Use 'file
normalize' rather than the defunct DejaGnu 'absolute' proc.
2016-01-03 Matthias Klose <doko@ubuntu.com> 2016-01-03 Matthias Klose <doko@ubuntu.com>
* include/jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases * include/jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases

View File

@ -416,7 +416,7 @@ 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 found_compiler 0
set d [absolute $objdir] set d [file normalize $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.