From c95bd9111ee75556a4a6ba51603856cee0afef2b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 5 Nov 2022 20:27:16 +0700 Subject: [PATCH] sim: use libtool to install programs 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. --- 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_LOCAL_DEPS) if [ -e $$d/run$(EXEEXT) ]; then \ n="$$run"; \ [ "$(SIM_PRIMARY_TARGET)" = "$$d" ] || n="$$n-$$d"; \ - $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) || exit 1; \ + $(LIBTOOL) --mode=install \ + $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) || exit 1; \ fi; \ done 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-gen$(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=`echo sis | sed '$(program_transform_name)'`; \ -@SIM_ENABLE_ARCH_erc32_TRUE@ $(INSTALL_PROGRAM) erc32/sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) +@SIM_ENABLE_ARCH_erc32_TRUE@ $(LIBTOOL) --mode=install $(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 @@ -3530,7 +3530,8 @@ install-exec-local: installdirs $(SIM_INSTALL_EXEC_LOCAL_DEPS) if [ -e $$d/run$(EXEEXT) ]; then \ n="$$run"; \ [ "$(SIM_PRIMARY_TARGET)" = "$$d" ] || n="$$n-$$d"; \ - $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) || exit 1; \ + $(LIBTOOL) --mode=install \ + $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) || exit 1; \ fi; \ done 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 += sim-%D-install-exec-local sim-%D-install-exec-local: installdirs $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) n=`echo sis | sed '$(program_transform_name)'`; \ - $(INSTALL_PROGRAM) %D%/sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) %D%/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) SIM_UNINSTALL_LOCAL_DEPS += sim-%D%-uninstall-local sim-%D%-uninstall-local: -- 2.30.2