Re: [PATCH RESEND v2] make: add install-stripped target
From: Junio C Hamano <hidden>
Date: 2021-09-01 17:15:20
Bagas Sanjaya [off-list ref] writes:
If we make $(INSTALL_OPTS) applies to both compiled executables and scripts, we have problem that $(INSTALL) -s only works for the former.
Then don't make it apply to both ;-) Isn't that what your patch did for early part of the install target? $(PROGRAMS) are installed with $(INSTALL_OPTS) while the invocation of $(INSTALL) for $(SCRIPTS) lack $(INSTALL_OPTS). If we were to pursue this further, it probably is a good idea to rename the $(INSTALL_OPTS) to $(INSTALL_STRIP) to avoid complaints by confused users. Something like this squashed into your patch, perhaps. Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git c/Makefile w/Makefile
index 28d1e9bfae..ebef4da50c 100644
--- c/Makefile
+++ w/Makefile@@ -465,6 +465,9 @@ all:: # the global variable _wpgmptr containing the absolute path of the current # executable (this is the case on Windows). # +# INSTALL_STRIP can be set to "-s" to strip binaries during installation, +# if your $(INSTALL) command supports the option. +# # Define GENERATE_COMPILATION_DATABASE to "yes" to generate JSON compilation # database entries during compilation if your compiler supports it, using the # `-MJ` flag. The JSON entries will be placed in the `compile_commands/`
@@ -3014,19 +3017,15 @@ profile-install: profile profile-fast-install: profile-fast $(MAKE) install -INSTALL_OPTS = - -.PHONY: install-stripped - -install-stripped: INSTALL_OPTS = -s --strip-program=$(STRIP) +INSTALL_STRIP = -install-stripped install: all +install: all $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) $(INSTALL_OPTS) $(PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + $(INSTALL) $(INSTALL_STRIP) $(PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) $(INSTALL_OPTS) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)' ifdef MSVC