diff options
| author | David Edelsohn <dje.gcc@gmail.com> | 2020-06-23 10:03:40 -0400 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-17 13:14:37 -0300 |
| commit | 25d86f8553c2d846d03d654e0e8a4a658794f9cc (patch) | |
| tree | e878255e83bf73c3a850c7dc47aca8c7234445f4 /gcc | |
| parent | 7b381ab7deee5e944ea92a16ff2e977707a9ac6c (diff) | |
| download | gcc-25d86f8553c2d846d03d654e0e8a4a658794f9cc.zip gcc-25d86f8553c2d846d03d654e0e8a4a658794f9cc.tar.gz gcc-25d86f8553c2d846d03d654e0e8a4a658794f9cc.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 |