From patchwork Tue Dec 31 18:42:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 37138 Received: (qmail 62122 invoked by alias); 31 Dec 2019 18:42:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 62110 invoked by uid 89); 31 Dec 2019 18:42:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=xn, Makefile.in, makefile.in, UD:Makefile.in X-HELO: sonic302-21.consmr.mail.ir2.yahoo.com Received: from sonic302-21.consmr.mail.ir2.yahoo.com (HELO sonic302-21.consmr.mail.ir2.yahoo.com) (87.248.110.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 31 Dec 2019 18:42:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s2048; t=1577817759; bh=NuykxWv4O2obB4sc/IL5cL+wW6kSwa8TRcV4NRsD/64=; h=From:To:Subject:Date:References:From:Subject; b=fRaKa9IDH8HgZuXCgdkDZfyoIRamocd6cMsTwpJ0X9GqMM/YXPHxM5/PdQ65FbVX/IaivCKNp05QZs+lnNEM+il5Ch4K/TYnWoqdOaZwxUggHPE/MBiQf1hCcMCrwtDTyyVR7J1ecTFUKjEEPPHXJQ2aj36aAKSEgKZV0bzzAmYfCs/btT5P5zJidrBMhC/aMynt4eSuyDPppEVMwfJVd1Zi8s8kmlTiYOEn5PBroginfjq36kFntpVpszC0sfe7k1ErqJUq+gweE4ifk01XY7vtE8HXJmaAxNpmxcPbUYk7xxF02t+Zy80zwGgskouZIZUO9c95lJwH+R2DqmVkbQ== Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.ir2.yahoo.com with HTTP; Tue, 31 Dec 2019 18:42:39 +0000 Received: by smtp430.mail.ir2.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID bb215b4d5e2d90320d9bbc50b89dfb4f; Tue, 31 Dec 2019 18:42:37 +0000 (UTC) X-Patchwork-Original-From: "Hannes Domani via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Hannes Domani To: gdb-patches@sourceware.org Subject: [PATCH v2] Fix install-strip for cross-compilation Date: Tue, 31 Dec 2019 19:42:22 +0100 Message-Id: <20191231184222.34267-1-ssbssa@yahoo.de> MIME-Version: 1.0 References: <20191231184222.34267-1-ssbssa.ref@yahoo.de> Content-Length: 2677 X-IsSubscribed: yes 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: 2019-12-30 Hannes Domani * Makefile.in: Use INSTALL_PROGRAM_ENV. gdb/gdbserver/ChangeLog: 2019-12-30 Hannes Domani * Makefile.in: Use INSTALL_PROGRAM_ENV. --- gdb/Makefile.in | 4 ++-- gdb/gdbserver/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index fa5c820b91..4a7ff6a454 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/Makefile.in b/gdb/gdbserver/Makefile.in index 9e8c213472..bcbcf94c51 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.