aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-11-06 21:09:25 +0700
committerMike Frysinger <vapier@gentoo.org>2022-11-06 21:48:42 +0700
commit93e0ec910afe8c9a05ed802e04823080eefd9502 (patch)
tree43b4a223a12fe9c7e458df00207ce6fff7b1834e /sim
parent1e5482d5686b77accc3b935a36b40a37fd699319 (diff)
downloadgdb-93e0ec910afe8c9a05ed802e04823080eefd9502.zip
gdb-93e0ec910afe8c9a05ed802e04823080eefd9502.tar.gz
gdb-93e0ec910afe8c9a05ed802e04823080eefd9502.tar.bz2
sim: build: respect AM_MAKEFLAGS when entering subdirs
This doesn't matter right now, but it will as we add more flags to the recursive make step to pass state down.
Diffstat (limited to 'sim')
-rw-r--r--sim/Makefile.am4
-rw-r--r--sim/Makefile.in14
-rw-r--r--sim/erc32/local.mk2
-rw-r--r--sim/m32c/local.mk2
-rw-r--r--sim/ppc/local.mk2
-rw-r--r--sim/rl78/local.mk2
-rw-r--r--sim/rx/local.mk2
7 files changed, 14 insertions, 14 deletions
diff --git a/sim/Makefile.am b/sim/Makefile.am
index b8d592a..7cdcc60 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -188,10 +188,10 @@ endif
## have Makefiles in subdirs.
%/libsim.a: | $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
%/nrun.o: common/nrun.c | %/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
all-recursive: $(SIM_ALL_RECURSIVE_DEPS)
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 746527d..34df0f8 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -3267,7 +3267,7 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
@SIM_ENABLE_ARCH_erc32_TRUE@ $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@
@SIM_ENABLE_ARCH_erc32_TRUE@erc32/%.o: erc32/%.c | erc32/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
-@SIM_ENABLE_ARCH_erc32_TRUE@ $(MAKE) -C $(@D) $(@F)
+@SIM_ENABLE_ARCH_erc32_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@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)'`; \
@@ -3306,7 +3306,7 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
@SIM_ENABLE_ARCH_lm32_TRUE@ $(AM_V_at)touch $@
@SIM_ENABLE_ARCH_m32c_TRUE@m32c/%.o: m32c/%.c | m32c/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
-@SIM_ENABLE_ARCH_m32c_TRUE@ $(MAKE) -C $(@D) $(@F)
+@SIM_ENABLE_ARCH_m32c_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
# These rules are copied from automake, but tweaked to use FOR_BUILD variables.
@SIM_ENABLE_ARCH_m32c_TRUE@m32c/opc2c$(EXEEXT): $(m32c_opc2c_OBJECTS) $(m32c_opc2c_DEPENDENCIES) m32c/$(am__dirstamp)
@@ -3437,13 +3437,13 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
@SIM_ENABLE_ARCH_ppc_TRUE@ $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@
@SIM_ENABLE_ARCH_ppc_TRUE@ppc/%.o: ppc/%.c | ppc/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
-@SIM_ENABLE_ARCH_ppc_TRUE@ $(MAKE) -C $(@D) $(@F)
+@SIM_ENABLE_ARCH_ppc_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@SIM_ENABLE_ARCH_rl78_TRUE@rl78/%.o: rl78/%.c | rl78/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
-@SIM_ENABLE_ARCH_rl78_TRUE@ $(MAKE) -C $(@D) $(@F)
+@SIM_ENABLE_ARCH_rl78_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: rx/%.c | rx/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
-@SIM_ENABLE_ARCH_rx_TRUE@ $(MAKE) -C $(@D) $(@F)
+@SIM_ENABLE_ARCH_rx_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
# These rules are copied from automake, but tweaked to use FOR_BUILD variables.
@SIM_ENABLE_ARCH_sh_TRUE@sh/gencode$(EXEEXT): $(sh_gencode_OBJECTS) $(sh_gencode_DEPENDENCIES) sh/$(am__dirstamp)
@@ -3504,10 +3504,10 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
@SIM_ENABLE_ARCH_v850_TRUE@ $(AM_V_at)touch $@
%/libsim.a: | $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
%/nrun.o: common/nrun.c | %/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
all-recursive: $(SIM_ALL_RECURSIVE_DEPS)
diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk
index 1c6f7b3..b53bcf8 100644
--- a/sim/erc32/local.mk
+++ b/sim/erc32/local.mk
@@ -28,7 +28,7 @@
## Helper targets for running make from the top-level due to run's sis.o.
%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
noinst_PROGRAMS += %D%/run %D%/sis
diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk
index efdf110..d38d555 100644
--- a/sim/m32c/local.mk
+++ b/sim/m32c/local.mk
@@ -26,7 +26,7 @@ noinst_PROGRAMS += %D%/run
## Helper targets for running make from the top-level due to run's main.o.
%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
%C%_BUILD_OUTPUTS = \
%D%/opc2c$(EXEEXT) \
diff --git a/sim/ppc/local.mk b/sim/ppc/local.mk
index 19a8a89..37d67b0 100644
--- a/sim/ppc/local.mk
+++ b/sim/ppc/local.mk
@@ -26,7 +26,7 @@
## Helper targets for running make from the top-level due to run's sis.o.
%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
noinst_PROGRAMS += %D%/run %D%/psim
diff --git a/sim/rl78/local.mk b/sim/rl78/local.mk
index 132fa3a..d38d4aa 100644
--- a/sim/rl78/local.mk
+++ b/sim/rl78/local.mk
@@ -26,4 +26,4 @@ noinst_PROGRAMS += %D%/run
## Helper targets for running make from the top-level due to run's main.o.
%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
diff --git a/sim/rx/local.mk b/sim/rx/local.mk
index 119a0f7..e26ea82 100644
--- a/sim/rx/local.mk
+++ b/sim/rx/local.mk
@@ -26,7 +26,7 @@ noinst_PROGRAMS += %D%/run
## Helper targets for running make from the top-level due to run's main.o.
%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS)
- $(MAKE) -C $(@D) $(@F)
+ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
%C%docdir = $(docdir)/%C%
%C%doc_DATA = %D%/README.txt