re PR ada/864 (--program-suffix is ignored (for ada))

2013-01-04  Richard Biener  <rguenther@suse.de>

	PR ada/864
	* gcc-interface/Make-lang.in (ada.install-common): Always apply
	program_transform_name.

From-SVN: r194964

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d58db12112b725fa95dc476774871fc677bf11f6..c7ee997481b49aead6109a86c283114d24254225 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-07  Richard Biener  <rguenther@suse.de>
+
+       PR ada/864
+       * gcc-interface/Make-lang.in (ada.install-common): Always apply
+       program_transform_name.
+
 2013-01-06  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnatvsn.ads (Current_Year): Bump to 2013.

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index cad64a36033517cea736d76d26702c9c952e93d9..0f5da9c07322a5beab8cde7ed43f89cd4a152a52 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -736,14 +736,13 @@ ada.install-common:
        -if [ -f gnat1$(exeext) ] ; \
        then \
          for tool in $(ADA_TOOLS) ; do \
+           install_name=`echo $$tool|sed '$(program_transform_name)'`$(exeext); \
+           $(RM) $(DESTDIR)$(bindir)/$$install_name; \
            if [ -f $$tool-cross$(exeext) ] ; \
            then \
-             install_name=`echo $$tool|sed '$(program_transform_name)'`$(exeext); \
-             $(RM) $(DESTDIR)$(bindir)/$$install_name; \
              $(INSTALL_PROGRAM) $$tool-cross$(exeext) $(DESTDIR)$(bindir)/$$install_name; \
            else \
-             $(RM) $(DESTDIR)$(bindir)/$$tool$(exeext); \
-             $(INSTALL_PROGRAM) $$tool$(exeext) $(DESTDIR)$(bindir)/$$tool$(exeext); \
+             $(INSTALL_PROGRAM) $$tool$(exeext) $(DESTDIR)$(bindir)/$$install_name; \
            fi ; \
          done; \
          $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \