diff options
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 9b85160..3a2ff2e 100644 --- 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 16094b9..8adcf44 100644 --- 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) ); \ |