diff options
| author | David Edelsohn <dje.gcc@gmail.com> | 2020-06-23 10:03:40 -0400 |
|---|---|---|
| committer | David Edelsohn <dje.gcc@gmail.com> | 2020-06-23 17:28:09 +0000 |
| commit | 17964eb3a054c634b743aae9d1d9414e1bf21885 (patch) | |
| tree | d2a54a775f5fa36e4e4a8c60bde22d5ad2ea7e1c /gcc | |
| parent | aec24341d0aac1ca57031d066503c420fb850023 (diff) | |
| download | gcc-17964eb3a054c634b743aae9d1d9414e1bf21885.zip gcc-17964eb3a054c634b743aae9d1d9414e1bf21885.tar.gz gcc-17964eb3a054c634b743aae9d1d9414e1bf21885.tar.bz2 | |
build: Change conditional include and empty.mk to -include in Makefiles
GNU Make supports "-include" keyword to prevent warnings and errors due to
inclusion of non-existent files. This patch changes gcc/ and libgcc/ to use
"-include" in place of the historical conditional inclusion and use of
empty.mk work-arounds.
gcc/ChangeLog
2020-06-23 David Edelsohn <dje.gcc@gmail.com>
* Makefile.in (LANG_MAKEFRAGS): Same.
(tmake_file): Use -include.
(xmake_file): Same.
libgcc/ChangeLog
2020-06-23 David Edelsohn <dje.gcc@gmail.com>
* Makefile.in: Remove uses of empty.mk. Use -include.
* config/avr/t-avr: Use -include.
* empty.mk: Delete.
libgcc/config/avr/libf7/ChangeLog
2020-06-23 David Edelsohn <dje.gcc@gmail.com>
* t-libf7: Same.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/Makefile.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 238b529..d5dcc03 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1763,22 +1763,16 @@ SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests gnat_install_lib = @gnat_install_lib@ # per-language makefile fragments -ifneq ($(LANG_MAKEFRAGS),) -include $(LANG_MAKEFRAGS) -endif +-include $(LANG_MAKEFRAGS) # target and host overrides must follow the per-language makefile fragments # so they can override or augment language-specific variables # target overrides -ifneq ($(tmake_file),) -include $(tmake_file) -endif +-include $(tmake_file) # host overrides -ifneq ($(xmake_file),) -include $(xmake_file) -endif +-include $(xmake_file) # all-tree.def includes all the tree.def files. all-tree.def: s-alltree; @true |