diff mbox series

c++tools: fix install-strip [PR 98328]

Message ID d0b6d5ec-7c10-d704-d4bd-161e2a3da84b@acm.org
State New
Headers show
Series c++tools: fix install-strip [PR 98328] | expand

Commit Message

Nathan Sidwell Dec. 16, 2020, 7:48 p.m. UTC 
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.

pushing to trunk

Comments

H.J. Lu Dec. 16, 2020, 7:51 p.m. UTC | #1 
On Wed, Dec 16, 2020 at 11:49 AM Nathan Sidwell <nathan@acm.org> wrote:
>
>
> I'd missed an install-strip rule in c++tools.  Here it is, cribbed
> from gcc/ subdir.
>
>          c++tools/

Missing PR other/98328 here.

>          * 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.
>
> pushing to trunk
> --
> Nathan Sidwell
diff mbox series

Patch

diff --git i/c++tools/Makefile.in w/c++tools/Makefile.in
index 4ec1419fa5b..310b5674fec 100644
--- i/c++tools/Makefile.in
+++ w/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 i/c++tools/configure w/c++tools/configure
index 82975120393..e8658aac16e 100755
--- i/c++tools/configure
+++ w/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 i/c++tools/configure.ac w/c++tools/configure.ac
index 75773650be7..c5560f68d4d 100644
--- i/c++tools/configure.ac
+++ w/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