diff options
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/Makefile.in | 19 |
2 files changed, 18 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 45c0a27..6fb8428 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-12-20 Mark Mitchell <mark@codesourcery.com> + + * Makefile.in (install-common): Do not install the specs file + unless SPECS is defined. + 2004-12-20 Zdenek Dvorak <dvorakz@suse.cz> PR rtl-optimization/18942 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c73562b..84282c5 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3236,12 +3236,19 @@ install-common: native $(EXTRA_PARTS) lang.install-common installdirs chmod a-x $(DESTDIR)$(libsubdir)/$$file; \ else true; fi; \ done -# Don't mess with specs if it doesn't exist yet. - -if [ -f specs ] ; then \ - rm -f $(DESTDIR)$(libsubdir)/specs; \ - $(INSTALL_DATA) $(SPECS) $(DESTDIR)$(libsubdir)/specs; \ - chmod a-x $(DESTDIR)$(libsubdir)/specs; \ - fi +# Remove any specs file installed by a previous version of GCC. + rm -f $(DESTDIR)$(libsubdir)/specs +ifneq ($(SPECS),specs) +# In general, we no longer install the specs file because its presence +# makes the driver slower, and because people who need it can recreate +# it by using -dumpspecs. +# +# However, in the case that the target has defined SPECS, then we must +# install the file. It may be that the installed specs file is +# different from that built into the driver. + $(INSTALL_DATA) $(SPECS) $(DESTDIR)$(libsubdir)/specs + chmod a-x $(DESTDIR)$(libsubdir)/specs +endif # Install protoize if it was compiled. -if [ -f protoize$(exeext) ]; then \ rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ |