From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 470B6385841E; Sat, 5 Nov 2022 13:29:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 470B6385841E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667654970; bh=OgTyu3rYahh/2NCTXAiO1naZk6Eb2FFQVjyu6l2LxTM=; h=From:To:Subject:Date:From; b=iyZMmQYKKObFlmvOb/9Q42tUszu3BEs24+pBW+QBPtlLbJuKrPy3PEM+11I+RTLyP HKzLwhd0ND8+OQYsfvjFuIgSQJjH2beLqRqQrs7xSD/YTJP+u4+hHXY7il12V+ebf7 MErfi/g8v78xKt67JukU6OvoZdoOn5IaGg7n2doM= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: use libtool to install programs X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: e5f7bc29350058330fbc3ed4fd0c6135bd892f53 X-Git-Newrev: c95bd9111ee75556a4a6ba51603856cee0afef2b Message-Id: <20221105132930.470B6385841E@sourceware.org> Date: Sat, 5 Nov 2022 13:29:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc95bd9111ee7= 5556a4a6ba51603856cee0afef2b commit c95bd9111ee75556a4a6ba51603856cee0afef2b Author: Mike Frysinger Date: Sat Nov 5 20:27:16 2022 +0700 sim: use libtool to install programs =20 Now that we use libtool to link, we have to use it to install instead of keeping the manual logic so we don't install wrapper shell scripts. Diff: --- sim/Makefile.am | 3 ++- sim/Makefile.in | 5 +++-- sim/erc32/local.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index 64847bc7abb..fb28f98ece7 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -214,7 +214,8 @@ install-exec-local: installdirs $(SIM_INSTALL_EXEC_LOCA= L_DEPS) if [ -e $$d/run$(EXEEXT) ]; then \ n=3D"$$run"; \ [ "$(SIM_PRIMARY_TARGET)" =3D "$$d" ] || n=3D"$$n-$$d"; \ - $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) ||= exit 1; \ + $(LIBTOOL) --mode=3Dinstall \ + $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) |= | exit 1; \ fi; \ done =20 diff --git a/sim/Makefile.in b/sim/Makefile.in index 67ba10c3b19..9df04fed45a 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -3271,7 +3271,7 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_erc32_TRUE@sim-%D-install-exec-local: installdirs @SIM_ENABLE_ARCH_erc32_TRUE@ $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) @SIM_ENABLE_ARCH_erc32_TRUE@ n=3D`echo sis | sed '$(program_transform_name= )'`; \ -@SIM_ENABLE_ARCH_erc32_TRUE@ $(INSTALL_PROGRAM) erc32/sis$(EXEEXT) $(DESTD= IR)$(bindir)/$$n$(EXEEXT) +@SIM_ENABLE_ARCH_erc32_TRUE@ $(LIBTOOL) --mode=3Dinstall $(INSTALL_PROGRAM= ) erc32/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) @SIM_ENABLE_ARCH_erc32_TRUE@sim-erc32-uninstall-local: @SIM_ENABLE_ARCH_erc32_TRUE@ rm -f $(DESTDIR)$(bindir)/sis =20 @@ -3530,7 +3530,8 @@ install-exec-local: installdirs $(SIM_INSTALL_EXEC_LO= CAL_DEPS) if [ -e $$d/run$(EXEEXT) ]; then \ n=3D"$$run"; \ [ "$(SIM_PRIMARY_TARGET)" =3D "$$d" ] || n=3D"$$n-$$d"; \ - $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) ||= exit 1; \ + $(LIBTOOL) --mode=3Dinstall \ + $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) |= | exit 1; \ fi; \ done =20 diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk index d73bc5b4bfe..1c6f7b3dbbd 100644 --- a/sim/erc32/local.mk +++ b/sim/erc32/local.mk @@ -39,7 +39,7 @@ SIM_INSTALL_EXEC_LOCAL_DEPS +=3D sim-%D-install-exec-local sim-%D-install-exec-local: installdirs $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) n=3D`echo sis | sed '$(program_transform_name)'`; \ - $(INSTALL_PROGRAM) %D%/sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) + $(LIBTOOL) --mode=3Dinstall $(INSTALL_PROGRAM) %D%/run$(EXEEXT) $(DESTDIR= )$(bindir)/$$n$(EXEEXT) =20 SIM_UNINSTALL_LOCAL_DEPS +=3D sim-%D%-uninstall-local sim-%D%-uninstall-local: