diff options
| author | Andreas Schwab <schwab@suse.de> | 2005-10-30 23:18:07 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2005-10-30 23:18:07 +0000 |
| commit | def6f17006cc6c008b3d68ea221f1634d5ed13ef (patch) | |
| tree | a1e03ef542d83fe717a1d6d9a436f5c57ec407d0 | |
| parent | 13679135440ac93a56c65acd4124758b2404557c (diff) | |
| download | gcc-def6f17006cc6c008b3d68ea221f1634d5ed13ef.zip gcc-def6f17006cc6c008b3d68ea221f1634d5ed13ef.tar.gz gcc-def6f17006cc6c008b3d68ea221f1634d5ed13ef.tar.bz2 | |
Make-lang.in (GFORTRAN_TARGET_INSTALL_NAME): Define.
* Make-lang.in (GFORTRAN_TARGET_INSTALL_NAME): Define.
(GFORTRAN_CROSS_NAME): Remove.
(fortran.install-common): Correctly install a cross compiler.
(fortran.uninstall): Use GFORTRAN_TARGET_INSTALL_NAME instead of
GFORTRAN_CROSS_NAME.
From-SVN: r106256
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/Make-lang.in | 15 |
2 files changed, 13 insertions, 10 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8b1560c..d375793 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2005-10-31 Andreas Schwab <schwab@suse.de> + + * Make-lang.in (GFORTRAN_TARGET_INSTALL_NAME): Define. + (GFORTRAN_CROSS_NAME): Remove. + (fortran.install-common): Correctly install a cross compiler. + (fortran.uninstall): Use GFORTRAN_TARGET_INSTALL_NAME instead of + GFORTRAN_CROSS_NAME. + 2005-10-30 Erik Edelmann <eedelman@gcc.gnu.org> * gfortran.texi: Update contributors. diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 485033e..96b6e25 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -42,9 +42,7 @@ # Actual name to use when installing a native compiler. GFORTRAN_INSTALL_NAME := $(shell echo gfortran|sed '$(program_transform_name)') - -# Actual name to use when installing a cross-compiler. -GFORTRAN_CROSS_NAME := $(shell echo gfortran|sed '$(program_transform_cross_name)') +GFORTRAN_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gfortran|sed '$(program_transform_name)') #^L @@ -189,18 +187,15 @@ fortran.install-normal: # and also as either gfortran (if native) or $(tooldir)/bin/gfortran. fortran.install-common: installdirs -if [ -f f951$(exeext) ] ; then \ + rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gfortran$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ if [ -f gfortran-cross$(exeext) ] ; then \ - rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) gfortran-cross$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \ - chmod a+x $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \ if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \ rm -f $(DESTDIR)$(gcc_tooldir)/bin/gfortran$(exeext); \ $(INSTALL_PROGRAM) gfortran-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gfortran$(exeext); \ else true; fi; \ else \ - rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) gfortran$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ - chmod a+x $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ $(LN) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ fi ; \ @@ -223,7 +218,7 @@ fortran.uninstall: else : ; fi; \ rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \ - rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \ + rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ rm -rf $(DESTDIR)$(infodir)/gfortran.info* # |