diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-29 20:44:55 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-29 22:27:16 -0400 |
| commit | cc717561416185c2328e68c3ba9dd3c8331d4976 (patch) | |
| tree | 1f2b23bce96bcddb70d7df1478a1fa6c80ca358b | |
| parent | 3167423f079e08f530df30eccad2a467c8ad5014 (diff) | |
| download | fsf-binutils-gdb-cc717561416185c2328e68c3ba9dd3c8331d4976.zip fsf-binutils-gdb-cc717561416185c2328e68c3ba9dd3c8331d4976.tar.gz fsf-binutils-gdb-cc717561416185c2328e68c3ba9dd3c8331d4976.tar.bz2 | |
sim: fix arch Makefile regen when unified
The $(arch) variable is only setup for cgen ports, so calculate this
value dynamically. We also need to generate multiple inputs in order
to properly recreate the subdir Makefile, so list them all.
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index da6511c..5d86dcb 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,10 @@ 2021-06-29 Mike Frysinger <vapier@gentoo.org> + * Make-common.in (Makefile): Replace $(arch) and pass more files to + config.status. + +2021-06-29 Mike Frysinger <vapier@gentoo.org> + * callback.c [!HAVE_KILL] (os_kill): Return ENOSYS. 2021-06-29 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index c203b4e..723bda5 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -534,7 +534,8 @@ force: Makefile: Makefile.in $(srccom)/Make-common.in $(config.status) @SIM_COMMON_BUILD_FALSE@ CONFIG_HEADERS= $(SHELL) ./config.status -@SIM_COMMON_BUILD_TRUE@ cd .. && $(SHELL) ./config.status $(arch)/Makefile +@SIM_COMMON_BUILD_TRUE@ pwd=`pwd` && subdir=`basename "$$pwd"` && cd .. && \ +@SIM_COMMON_BUILD_TRUE@ $(SHELL) ./config.status Make-common.sim $$subdir/Makefile.sim $$subdir/Makefile @SIM_COMMON_BUILD_FALSE@config.status: configure @SIM_COMMON_BUILD_FALSE@ $(SHELL) ./config.status --recheck |