diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-11-07 21:30:10 +0700 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-11-07 21:51:11 +0700 |
| commit | 2ba09f42f1e0a9ad44235c0cea991396b2fc520d (patch) | |
| tree | cd7cef93071e77b7557e441aeeffea9f5b342fe5 /sim/Makefile.in | |
| parent | 200164d46732f6a2fb9d81aa9650c006db4148e6 (diff) | |
| download | gdb-2ba09f42f1e0a9ad44235c0cea991396b2fc520d.zip gdb-2ba09f42f1e0a9ad44235c0cea991396b2fc520d.tar.gz gdb-2ba09f42f1e0a9ad44235c0cea991396b2fc520d.tar.bz2 | |
sim: build: add a proper var for enabled arches
The install code was using $SUBDIRS to track all enabled arches. This
works, but isn't great if we want to add a subdir that isn't an arch
port, or as we merge the subdirs into the top-level. Create a new var
explicitly to track the list of enabled arches instead.
Diffstat (limited to 'sim/Makefile.in')
| -rw-r--r-- | sim/Makefile.in | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index 34df0f8..b50993a 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1084,6 +1084,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIM_COMMON_BUILD_FALSE = @SIM_COMMON_BUILD_FALSE@ SIM_COMMON_BUILD_TRUE = @SIM_COMMON_BUILD_TRUE@ +SIM_ENABLED_ARCHES = @SIM_ENABLED_ARCHES@ SIM_FRV_TRAPDUMP_FLAGS = @SIM_FRV_TRAPDUMP_FLAGS@ SIM_HW_CFLAGS = @SIM_HW_CFLAGS@ SIM_HW_SOCKSER = @SIM_HW_SOCKSER@ @@ -3514,30 +3515,26 @@ all-recursive: $(SIM_ALL_RECURSIVE_DEPS) install-data-local: installdirs $(SIM_INSTALL_DATA_LOCAL_DEPS) $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(libdir) lib=`echo sim | sed '$(program_transform_name)'`; \ - for d in $(SUBDIRS); do \ - if [ -e $$d/run$(EXEEXT) ]; then \ - n="$$lib"; \ - [ "$(SIM_PRIMARY_TARGET)" = "$$d" ] || n="$$n-$$d"; \ - n="lib$$n.a"; \ - $(INSTALL_DATA) $$d/libsim.a $(DESTDIR)$(libdir)/$$n || exit 1; \ - fi; \ + for d in $(SIM_ENABLED_ARCHES); do \ + n="$$lib"; \ + [ "$(SIM_PRIMARY_TARGET)" = "$$d" ] || n="$$n-$$d"; \ + n="lib$$n.a"; \ + $(INSTALL_DATA) $$d/libsim.a $(DESTDIR)$(libdir)/$$n || exit 1; \ done install-exec-local: installdirs $(SIM_INSTALL_EXEC_LOCAL_DEPS) $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) run=`echo run | sed '$(program_transform_name)'`; \ - for d in $(SUBDIRS); do \ - if [ -e $$d/run$(EXEEXT) ]; then \ - n="$$run"; \ - [ "$(SIM_PRIMARY_TARGET)" = "$$d" ] || n="$$n-$$d"; \ - $(LIBTOOL) --mode=install \ - $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) || exit 1; \ - fi; \ + for d in $(SIM_ENABLED_ARCHES); do \ + n="$$run"; \ + [ "$(SIM_PRIMARY_TARGET)" = "$$d" ] || n="$$n-$$d"; \ + $(LIBTOOL) --mode=install \ + $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) || exit 1; \ done uninstall-local: $(SIM_UNINSTALL_LOCAL_DEPS) rm -f $(DESTDIR)$(bindir)/run $(DESTDIR)$(libdir)/libsim.a - for d in $(SUBDIRS); do \ + for d in $(SIM_ENABLED_ARCHES); do \ rm -f $(DESTDIR)$(bindir)/run-$$d $(DESTDIR)$(libdir)/libsim-$$d.a; \ done |