re PR bootstrap/14614 (Double target prefixed gcjh)

	PR bootstrap/14614:
	* Make-lang.in (java.install-common): Only install transformed

From-SVN: r91692

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9b851605110703990dbb5c6b48afaca5294da2db..3a2ff2e3ea36577107a84634f9f3c63dfd503c7f 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-03  Tom Tromey  <tromey@redhat.com>
+
+       PR bootstrap/14614:
+       * Make-lang.in (java.install-common): Only install transformed
+       gcjh if gcj-cross exists.
+
 2004-12-03  Andrew Haley  <aph@redhat.com>
 
        PR java/18812

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 16094b9c28b7a0c2f922c9b0ac3af14baeffeed7..8adcf44d610b24799012a45c16b6231657e64ad2 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -217,7 +217,9 @@ java.install-common: installdirs
            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) ); \