[binutils-gdb] Fix install-strip for cross-compilation

[Hannes Domani]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=48189beca8aeb629deaf2d92268d6d234ce19aeb

commit 48189beca8aeb629deaf2d92268d6d234ce19aeb
Author: Hannes Domani <ssbssa@yahoo.de>
Date:   Mon Dec 30 17:01:02 2019 +0100

    Fix install-strip for cross-compilation
    
    The variable INSTALL_PROGRAM_ENV sets up STRIPPROG for the cross-compiler.
    
    If this is not done, the host 'strip' is used, and fails:
    
    /bin/sh /c/src/repos/binutils-gdb.git/install-sh -c -s gdb.exe \
      /gdb/gdb64-git/bin/$transformed_name.exe
    strip.exe:C:/gdb/gdb64-git/bin/_inst.33599_: file format not recognized
    
    With this change, it's fine:
    
    STRIPPROG='x86_64-w64-mingw32-strip' \
      /bin/sh /c/src/repos/binutils-gdb.git/install-sh -c -s gdb.exe \
      /gdb/gdb64-git/bin/$transformed_name.exe
    
    gdb/ChangeLog:
    
    2020-01-01  Hannes Domani  <ssbssa@yahoo.de>
    
    	* Makefile.in: Use INSTALL_PROGRAM_ENV.
    
    gdb/gdbserver/ChangeLog:
    
    2020-01-01  Hannes Domani  <ssbssa@yahoo.de>
    
    	* Makefile.in: Use INSTALL_PROGRAM_ENV.

Diff:
---
 gdb/ChangeLog             | 4 ++++
 gdb/Makefile.in           | 4 ++--
 gdb/gdbserver/ChangeLog   | 4 ++++
 gdb/gdbserver/Makefile.in | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 11e828a..5edb1c4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2020-01-01  Hannes Domani  <ssbssa@yahoo.de>
 
+	* Makefile.in: Use INSTALL_PROGRAM_ENV.
+
+2020-01-01  Hannes Domani  <ssbssa@yahoo.de>
+
 	* MAINTAINERS (Write After Approval): Add myself.
 
 2020-01-01  Joel Brobecker  <brobecker@adacore.com>
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e9a7478..448a495 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1779,7 +1779,7 @@ install-only: $(CONFIG_INSTALL)
 		  true ; \
 		fi ; \
 		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \
-		$(INSTALL_PROGRAM) gdb$(EXEEXT) \
+		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gdb$(EXEEXT) \
 			$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
 		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(includedir)/gdb ; \
 		$(INSTALL_DATA) jit-reader.h $(DESTDIR)$(includedir)/gdb/jit-reader.h
@@ -2517,7 +2517,7 @@ install-gdbtk:
 	  true ; \
 	fi ; \
 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir); \
-	$(INSTALL_PROGRAM) insight$(EXEEXT) \
+	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) insight$(EXEEXT) \
 		$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
 	$(SHELL) $(srcdir)/../mkinstalldirs \
 		$(DESTDIR)$(GDBTK_LIBRARY) ; \
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 12a7f00..4d16083 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-01  Hannes Domani  <ssbssa@yahoo.de>
+
+	* Makefile.in: Use INSTALL_PROGRAM_ENV.
+
 2020-01-01  Joel Brobecker  <brobecker@adacore.com>
 
 	* server.c (gdbserver_version): Change copyright year to 2020.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 7d7d38a..d39c065 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -381,10 +381,10 @@ install-only:
 	if [ x$$n = x ]; then n=gdbserver; else true; fi; \
 	if [ x"$(IPA_DEPFILES)" != x ]; then \
 		$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir); \
-		$(INSTALL_PROGRAM) $(IPA_LIB) $(DESTDIR)$(libdir)/$(IPA_LIB); \
+		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(IPA_LIB) $(DESTDIR)$(libdir)/$(IPA_LIB); \
 	fi; \
 	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir); \
-	$(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
+	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
 	# Note that we run install and not install-only, as the latter
 	# is not part of GNU standards and in particular not provided
 	# in libiberty.