diff options
| author | Nathan Sidwell <nathan@acm.org> | 2020-12-16 11:44:42 -0800 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2020-12-16 11:57:31 -0800 |
| commit | 3f78c8cb7f0e025a61734af8d9b9ad70e1b66e40 (patch) | |
| tree | d5ecca3cab502afcd21db4394fd28bae60b778a6 | |
| parent | 4d4f82959aa0802611f1183389c4c74d22431e49 (diff) | |
c++tools: fix install-strip [PR 98328]
I'd missed an install-strip rule in c++tools. Here it is, cribbed
from gcc/ subdir.
c++tools/
* Makefile.in (INSTALL): Replace with ...
(INSTALL_PROGRAM): ... this.
(INSTALL_STRIP_PROGRAM): New.
(install-strip): New target.
(install): Use INSTALL_PROGRAM.
* configure.ac: Add INSTALL_PROGRAM.
* configure: Regenerated.
| -rw-r--r-- | c++tools/Makefile.in | 33 | ||||
| -rwxr-xr-x | c++tools/configure | 2 | ||||
| -rw-r--r-- | c++tools/configure.ac | 2 |
3 files changed, 24 insertions, 13 deletions
diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in index 4ec1419fa5b..310b5674fec 100644 --- a/c++tools/Makefile.in +++ b/c++tools/Makefile.in @@ -22,7 +22,8 @@ libexecdir := @libexecdir@ target_noncanonical := @target_noncanonical@ version := $(shell cat $(srcdir)/../gcc/BASE-VER) libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(version) -INSTALL := @INSTALL@ +INSTALL_PROGRAM := @INSTALL_PROGRAM@ +INSTALL_STRIP_PROGRAM := $(srcdir)/../install-sh -c -s AUTOCONF := @AUTOCONF@ AUTOHEADER := @AUTOHEADER@ CXX := @CXX@ @@ -47,16 +48,23 @@ maintainer-clean:: install:: -check: -installcheck: -dvi: -pdf: -html: -info: -install-info: -install-pdf: -install-man: -install-html: +check:: +installcheck:: +dvi:: +pdf:: +html:: +info:: +install-info:: +install-pdf:: +install-man:: +install-html:: + +install-strip: override INSTALL_PROGRAM = $(INSTALL_STRIP_PROGRAM) +ifneq ($(STRIP),) +install-strip: STRIPPROG = $(STRIP) +export STRIPPROG +endif +install-strip: install vpath %.cc $(srcdir) vpath %.in $(srcdir) @@ -90,8 +98,7 @@ all::../gcc/g++-mapper-server$(exeext) install:: $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(libexecsubdir) - $(INSTALL) g++-mapper-server$(exeext) $(DESTDIR)$(libexecsubdir) - + $(INSTALL_PROGRAM) g++-mapper-server$(exeext) $(DESTDIR)$(libexecsubdir) endif ifneq ($(MAINTAINER),) diff --git a/c++tools/configure b/c++tools/configure index 82975120393..e8658aac16e 100755 --- a/c++tools/configure +++ b/c++tools/configure @@ -2060,6 +2060,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' diff --git a/c++tools/configure.ac b/c++tools/configure.ac index 75773650be7..c5560f68d4d 100644 --- a/c++tools/configure.ac +++ b/c++tools/configure.ac @@ -32,6 +32,8 @@ ACX_NONCANONICAL_TARGET AC_CANONICAL_SYSTEM AC_PROG_INSTALL +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +AC_SUBST(INSTALL_PROGRAM) AC_PROG_CXX MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing |