diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/Makefile.in | 23 | ||||
| -rw-r--r-- | gcc/config/i386/t-cygming | 2 | ||||
| -rw-r--r-- | gcc/doc/install.texi | 11 |
4 files changed, 39 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c6da1be..9544c3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR other/46202 + * Makefile.in (install_sh, INSTALL_STRIP_PROGRAM): New + variables. + (AR_FOR_TARGET, RANLIB_FOR_TARGET, STRIP_FOR_TARGET): Fix + shell quoting. + (STRIP_FOR_TARGET): Look for in-tree strip under name strip-new. + (install-strip): New target. + (STRIPPROG): New variable, exported if STRIP is set. + * doc/install.texi (Final install): Minor markup and code style + fixes. Document install-strip target. + 2010-11-20 Paul Koning <ni1d@arrl.net> * config/pdp11/pdp11-protos.h (pdp11_initial_elimination_offset, diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 5491aeaf..98f06e9 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -22,7 +22,7 @@ #<http://www.gnu.org/licenses/>. # The targets for external use include: -# all, doc, install, install-cross, install-cross-rest, +# all, doc, install, install-cross, install-cross-rest, install-strip, # uninstall, TAGS, mostlyclean, clean, distclean, maintainer-clean. # This is the default target. @@ -255,6 +255,8 @@ LN_S=@LN_S@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL@ +install_sh = $(SHELL) $(srcdir)/../install-sh +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s MAKEINFO = @MAKEINFO@ MAKEINFOFLAGS = --no-split TEXI2DVI = texi2dvi @@ -387,7 +389,7 @@ AR_FOR_TARGET := $(shell \ if [ "$(host)" = "$(target)" ] ; then \ echo $(AR); \ else \ - t='$(program_transform_name)'; echo ar | sed -e $$t ; \ + t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \ fi; \ fi) AR_FLAGS_FOR_TARGET = @@ -402,20 +404,20 @@ RANLIB_FOR_TARGET := $(shell \ if [ "$(host)" = "$(target)" ] ; then \ echo $(RANLIB); \ else \ - t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \ + t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \ fi; \ fi) ORIGINAL_LD_FOR_TARGET = @ORIGINAL_LD_FOR_TARGET@ ORIGINAL_NM_FOR_TARGET = @ORIGINAL_NM_FOR_TARGET@ NM_FOR_TARGET = ./nm STRIP_FOR_TARGET := $(shell \ - if [ -f $(objdir)/../binutils/strip ] ; then \ - echo $(objdir)/../binutils/strip ; \ + if [ -f $(objdir)/../binutils/strip-new ] ; then \ + echo $(objdir)/../binutils/strip-new ; \ else \ if [ "$(host)" = "$(target)" ] ; then \ echo strip; \ else \ - t='$(program_transform_name)'; echo strip | sed -e $$t ; \ + t='$(program_transform_name)'; echo strip | sed -e "$$t" ; \ fi; \ fi) @@ -4488,7 +4490,7 @@ maintainer-clean: -rm -f gcc.??s gcc.*aux -rm -f $(gcc_docdir)/*.info $(gcc_docdir)/*.1 $(gcc_docdir)/*.7 $(gcc_docdir)/*.dvi $(gcc_docdir)/*.pdf # -# Entry points `install' and `uninstall'. +# Entry points `install', `install-strip', and `uninstall'. # Also use `install-collect2' to install collect2 when the config files don't. # Copy the compiler files into directories where they will be run. @@ -4502,6 +4504,13 @@ ifeq ($(enable_plugin),yes) install: install-plugin endif +install-strip: override INSTALL_PROGRAM = $(INSTALL_STRIP_PROGRAM) +ifneq ($(STRIP),) +install-strip: STRIPPROG = $(STRIP) +export STRIPPROG +endif +install-strip: install + # Handle cpp installation. install-cpp: installdirs cpp$(exeext) -rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext) diff --git a/gcc/config/i386/t-cygming b/gcc/config/i386/t-cygming index 183e545..6395ff9 100644 --- a/gcc/config/i386/t-cygming +++ b/gcc/config/i386/t-cygming @@ -92,7 +92,7 @@ SHLIB_LINK = $(LN_S) -f $(SHLIB_MAP) $(SHLIB_MAP).def && \ # libgcc.mk. We want this delayed until actual install time. SHLIB_INSTALL = \ $$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ - $(INSTALL_PROGRAM) $(SHLIB_DIR)/$(SHLIB_SONAME) \ + $(INSTALL) $(SHLIB_DIR)/$(SHLIB_SONAME) \ $$(DESTDIR)$$(bindir)/$(SHLIB_SONAME); \ $(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_IMPLIB) \ $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_IMPLIB) diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 1c9d463..e67793a 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -2617,7 +2617,7 @@ messages may be automatically processed. Now that GCC has been built (and optionally tested), you can install it with @smallexample -cd @var{objdir}; make install +cd @var{objdir} && make install @end smallexample We strongly recommend to install into a target directory where there is @@ -2653,7 +2653,8 @@ jail can be achieved with the command make DESTDIR=@var{path-to-rootdir} install @end smallexample -@noindent where @var{path-to-rootdir} is the absolute path of +@noindent +where @var{path-to-rootdir} is the absolute path of a directory relative to which all installation paths will be interpreted. Note that the directory specified by @code{DESTDIR} need not exist yet; it will be created if necessary. @@ -2667,6 +2668,12 @@ it will not be created otherwise. This is regarded as a feature, not as a bug, because it gives slightly more control to the packagers using the @code{DESTDIR} feature. +You can install stripped programs and libraries with + +@smallexample +make install-strip +@end smallexample + If you are bootstrapping a released version of GCC then please quickly review the build status page for your release, available from @uref{http://gcc.gnu.org/buildstat.html}. |