This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch: RFA: fix for PR bootstrap/14614


This patch fixes PR bootstrap/14614.

It changes the install code for gcjh to use the same sort of test that
other install code uses.

Ok?

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	PR bootstrap/14614:
	* Make-lang.in (java.install-common): Only install transformed
	gcjh if gcj-cross exists.

Index: Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.147
diff -u -r1.147 Make-lang.in
--- Make-lang.in 18 Oct 2004 06:35:09 -0000 1.147
+++ Make-lang.in 15 Nov 2004 21:34:27 -0000
@@ -215,7 +215,9 @@
 	    rm -f $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \
 	    $(INSTALL_PROGRAM) $$tool$(exeext) $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \
 	    chmod a+x $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \
-	    if [ $$tool = gcjh ]; then \
+	    if [ -f $(GCJ)-cross$(exeext) ]; then \
+	      true; \
+	    elif [ $$tool = gcjh ]; then \
 	      rm -f $(DESTDIR)$(bindir)/$(GCJH_TARGET_INSTALL_NAME)$(exeext); \
 	      ( cd $(DESTDIR)$(bindir) && \
 	        $(LN) $$tool_transformed_name$(exeext) $(GCJH_TARGET_INSTALL_NAME)$(exeext) ); \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]