This is the mail archive of the
cygwin-apps@cygwin.com
mailing list for the Cygwin project.
[cygwin gcc-3.1] libjava/testsuite/lib/libjava.exp patch
- From: "Billinghurst, David (CRTS)" <David dot Billinghurst at riotinto dot com>
- To: <cygwin-apps at gcc dot gnu dot org>
- Date: Sun, 9 Jun 2002 13:02:30 +1000
- Subject: [cygwin gcc-3.1] libjava/testsuite/lib/libjava.exp patch
Backport of 3.2 patches to cygwin gcc-3.1 branch.
2002-06-09 David.Billinghurst <David.Billinghurst@riotinto.com>
2002-05-09 David.Billinghurst <David.Billinghurst@riotinto.com>
* testsuite/lib/libjava.exp (test_libjava_from_javac):
Append .exe to executable names. Fix for cygwin.
2002-05-06 David.Billinghurst <David.Billinghurst@riotinto.com>
* testsuite/lib/libjava.exp (libjava_arguments): Don't link
with -no-install on *-*-cygwin*.
2002-05-06 David.Billinghurst <David.Billinghurst@riotinto.com>
* testsuite/lib/libjava.exp (test_libjava_from_source):
Add comment explaining last patch
2002-05-04 David Billinghurst <David.Billinghurst@riotinto.com>
* testsuite/lib/libjava.exp (test_libjava_from_source):
Append .exe to executable names. If no suffix is present,
then ".exe" is added by default on win32. Harmless
elsewhere so always do it.
Index: lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.33.2.5
diff -u -r1.33.2.5 libjava.exp
--- lib/libjava.exp 17 May 2002 21:11:35 -0000 1.33.2.5
+++ lib/libjava.exp 9 Jun 2002 02:56:11 -0000
@@ -383,8 +383,11 @@
}
# Avoid libtool wrapper scripts when possible.
+ # but not if libtool warnings results in FAILs
if {$mode == "link"} {
- lappend args "additional_flags=-no-install"
+ if {! [istarget "*-*-cygwin*"]} {
+ lappend args "additional_flags=-no-install"
+ }
}
return $args
@@ -467,6 +470,10 @@
append executable ".o"
set target object
} else {
+ # DOS/win32 targets default to .exe if no suffix is given
+ # We then try to delete a file that doesn't exist. It is
+ # simpler to add the suffix everywhere.
+ append executable ".exe"
set target executable
}
if { $compile_args != "" } {
@@ -691,7 +698,10 @@
} else {
set type executable
lappend largs "additional_flags=--main=$main_name"
- set executable "${objdir}/$main_name"
+ # DOS/win32 targets default to .exe if no suffix is given
+ # We then try to delete a file that doesn't exist. It is
+ # simpler to add the suffix everywhere.
+ set executable "${objdir}/${main_name}.exe"
set mode link
}