diff options
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/Makerules b/Makerules index 485b5c035c..53d82c0204 100644 --- a/Makerules +++ b/Makerules @@ -94,28 +94,9 @@ vpath %.x $(subst $(empty) ,:,$(strip $(common-objpfx) $(objpfx) \ # being included individually by a subdir makefile (hurd/Makefile needs this). in-Makerules := yes --include $(+sysdir_pfx)sysd-Makefile -ifndef avoid-generated -ifneq ($(sysd-Makefile-sysdirs),$(config-sysdirs)) -sysd-Makefile-force = FORCE -FORCE: -endif -$(+sysdir_pfx)sysd-Makefile: $(+sysdir_pfx)config.make $(..)Makerules \ - $(sysd-Makefile-force) - -@rm -f $@T - (echo 'sysd-Makefile-sysdirs := $(config-sysdirs)'; \ - for file in $(config-sysdirs:=/Makefile); do \ - if [ -f $(..)$$file ]; then \ - echo include "\$$(..)$$file"; \ - else true; fi; \ - done; \ - echo 'sysd-Makefile-done=t') > $@T - mv -f $@T $@ -endif - -ifndef sysd-Makefile-done -# Don't do deps until this exists, because it might change the sources list. -no_deps=t +sysdep-makefiles := $(wildcard $(full_config_sysdirs:=/Makefile)) +ifneq (,$(sysdep-makefiles)) +include $(sysdep-makefiles) endif @@ -230,10 +211,6 @@ endef close-check-inhibit-asm = ;; esac ; endif -# Don't include sysd-rules until sysd-Makefile is already there and has been -# included. It might define inhibit-sysdep-asm, which would affect the -# contents of sysd-rules. -ifdef sysd-Makefile-done -include $(+sysdir_pfx)sysd-rules ifneq ($(sysd-rules-sysdirs),$(config-sysdirs)) # The value of $(+sysdep_dirs) the sysd-rules was computed for @@ -241,7 +218,6 @@ ifneq ($(sysd-rules-sysdirs),$(config-sysdirs)) sysd-rules-force = FORCE FORCE: endif -endif $(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \ $(wildcard $(foreach dir,$(sysdirs),\ $(dir)/Makefile))\ |