Make-lang.in: (java.install-common) Add symlink for $(target_noncanonical)-gcjh for...

	* Make-lang.in: (java.install-common) Add
	symlink for $(target_noncanonical)-gcjh for
	native builds.

From-SVN: r73875

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 5155450bc5ce524bb8b6b5a25deaf983a0250e02..4c7afaedb7b7070f9480d3d242c48cbd87fc7820 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-24  Mohan Embar  <gnustuff@thisiscool.com>
+
+       * Make-lang.in: (java.install-common) Add
+       symlink for $(target_noncanonical)-gcjh for
+       native builds.
+
 2003-11-20  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        * Make-lang.in (java.extraclean): Delete.

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 56a5fd5675deca02305552f52011204a7f4e2987..e7a5bae4fbeb795b4b97649095ade286a7341fd1 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -43,6 +43,7 @@
 # Actual names to use when installing a native compiler.
 JAVA_INSTALL_NAME = `echo gcj|sed '$(program_transform_name)'`
 JAVA_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcj|sed '$(program_transform_name)'`
+GCJH_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcjh|sed '$(program_transform_name)'`
 
 # Actual names to use when installing a cross-compiler.
 JAVA_CROSS_NAME = `echo gcj|sed '$(program_transform_cross_name)'`
@@ -179,6 +180,11 @@ check-java :
 # Nothing to do here.
 java.install-normal:
 
+# Install gcj as well as the target-independent tools.
+# For a native build, we special-case gcjh and also install
+# its explicitly-prefixed variant. This allows us to write
+# portable makefiles for both cross builds (where gcjh *must*
+# be explicitly prefixed) and native builds.
 java.install-common: installdirs
        -if [ -f $(GCJ)$(exeext) ]; then \
          if [ -f $(GCJ)-cross$(exeext) ]; then \
@@ -200,6 +206,11 @@ 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 \
+             rm -f $(DESTDIR)$(bindir)/$(GCJH_TARGET_INSTALL_NAME)$(exeext); \
+             ( cd $(DESTDIR)$(bindir) && \
+               $(LN) $$tool_transformed_name$(exeext) $(GCJH_TARGET_INSTALL_NAME)$(exeext) ); \
+           fi; \
           fi ; \
        done