From 5b638c3a5af30d98009c94fa309beec02e9ba330 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 7 Jan 2013 10:14:48 +0000 Subject: [PATCH] re PR ada/864 (--program-suffix is ignored (for ada)) 2013-01-04 Richard Biener PR ada/864 * gcc-interface/Make-lang.in (ada.install-common): Always apply program_transform_name. From-SVN: r194964 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/Make-lang.in | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d58db12..c7ee9974 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2013-01-07 Richard Biener + + PR ada/864 + * gcc-interface/Make-lang.in (ada.install-common): Always apply + program_transform_name. + 2013-01-06 Eric Botcazou * 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 cad64a3..0f5da9c 100644 --- 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); \ -- 2.7.4