diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2012-03-07 12:39:25 +0100 |
|---|---|---|
| committer | Ralf Corsepius <corsepiu@gcc.gnu.org> | 2012-03-07 12:39:25 +0100 |
| commit | d6baa4460bbf17a6e9f0a7b7aea6d6a8241c389e (patch) | |
| tree | e0959be47680607dd3c83688a4245b46b4a71c6c /gcc | |
| parent | 4e30d980cb5a6e0aaa9ba6da247834253f5516c8 (diff) | |
| download | gcc-d6baa4460bbf17a6e9f0a7b7aea6d6a8241c389e.zip gcc-d6baa4460bbf17a6e9f0a7b7aea6d6a8241c389e.tar.gz gcc-d6baa4460bbf17a6e9f0a7b7aea6d6a8241c389e.tar.bz2 | |
re PR other/51417 (Cross-compiler - wrappers for ar, nm, ranlib installed under wrong names)
2012-03-05 Ralf Corsépius <ralf.corsepius@rtems.org>
PR target/51417
* Makefile.in: Let install-gcc-ar depend on installdirs, gcc-ar$(exeext),
gcc-nm$(exeext), gcc-ranlib$(exeext).
Don't double canonicalize if cross-compiling.
From-SVN: r185035
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/Makefile.in | 20 |
2 files changed, 16 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c8895e8..9c98672 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-03-07 Ralf Corsépius <ralf.corsepius@rtems.org> + + PR target/51417 + * Makefile.in: Let install-gcc-ar depend on installdirs, gcc-ar$(exeext), + gcc-nm$(exeext), gcc-ranlib$(exeext). + Don't double canonicalize if cross-compiling. + 2012-03-07 Georg-Johann Lay <avr@gjlay.de> PR target/52506 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 0b7e635..6e7148f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4807,20 +4807,18 @@ install-collect2: collect2 installdirs install-lto-wrapper: lto-wrapper$(exeext) $(INSTALL_PROGRAM) lto-wrapper$(exeext) $(DESTDIR)$(libexecsubdir)/lto-wrapper$(exeext) -install-gcc-ar: - set -e ; \ - for i in ar nm ranlib ; do \ - install_name=`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ;\ - target_install_name=$(target_noncanonical)-`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ; \ - binname=gcc-$$i$(exeext) ; \ - rm -f $(DESTDIR)$(bindir)/$$install_name ; \ - rm -f $(DESTDIR)$(bindir)/$$target_install_name ; \ - $(INSTALL_PROGRAM) $$binname $(DESTDIR)$(bindir)/$$install_name ;\ - if test -f $(DESTDIR)$(bindir)$$target_install_name ; then \ +install-gcc-ar: installdirs gcc-ar$(exeext) gcc-nm$(exeext) gcc-ranlib$(exeext) + for i in gcc-ar gcc-nm gcc-ranlib; do \ + install_name=`echo $$i|sed '$(program_transform_name)'` ;\ + target_install_name=$(target_noncanonical)-`echo $$i|sed '$(program_transform_name)'` ; \ + rm -f $(DESTDIR)$(bindir)/$$install_name$(exeext) ; \ + $(INSTALL_PROGRAM) $$i$(exeext) $(DESTDIR)$(bindir)/$$install_name$(exeext) ;\ + if test -f gcc-cross$(exeext); then \ :; \ else \ + rm -f $(DESTDIR)$(bindir)/$$target_install_name$(exeext); \ ( cd $(DESTDIR)$(bindir) && \ - $(LN) $$install_name $$target_install_name ) ; \ + $(LN) $$install_name$(exeext) $$target_install_name$(exeext) ) ; \ fi ; \ done |