diff options
| author | David Edelsohn <dje.gcc@gmail.com> | 2020-06-22 21:27:18 +0000 |
|---|---|---|
| committer | David Edelsohn <dje.gcc@gmail.com> | 2020-06-22 21:31:48 +0000 |
| commit | 0164e59835de81d758fd4c56248ad7a46435fbfa (patch) | |
| tree | 5f33fcb2b515b2ad7f2aeda7c50322d502936ee8 /libgomp | |
| parent | 67f6ef3b3804a0ddc6926e992f6020ed95e11ea6 (diff) | |
| download | gcc-0164e59835de81d758fd4c56248ad7a46435fbfa.zip gcc-0164e59835de81d758fd4c56248ad7a46435fbfa.tar.gz gcc-0164e59835de81d758fd4c56248ad7a46435fbfa.tar.bz2 | |
build: Use -include instead of conditional include.
Automake and GNU Make both use the endif keyword, which conflicts and
elicits an error for matching if/ifdef and endif.
This patch changes the conditional include to use "-include" to prevent
a warning about a possible empty tmake_file.
libgomp/ChangeLog
2020-06-22 David Edelsohn <dje.gcc@gmail.com>
* Makefile.am: Use -include.
* Makefile.in: Regenerate.
libatomic/ChangeLog
2020-06-22 David Edelsohn <dje.gcc@gmail.com>
* Makefile.am: Use -include.
* Makefile.in: Regenerate.
libstdc++-v3/ChangeLog
2020-06-22 David Edelsohn <dje.gcc@gmail.com>
* Makefile.am: Use -include.
* Makefile.in: Regenerate.
libgfortran/ChangeLog
2020-06-22 David Edelsohn <dje.gcc@gmail.com>
* Makefile.am: Use -include.
* Makefile.in: Regenerate.
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/Makefile.am | 4 | ||||
| -rw-r--r-- | libgomp/Makefile.in | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 16b6995..586c930 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -142,8 +142,6 @@ CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) MAINTAINERCLEANFILES = $(srcdir)/libgomp.info # target overrides -ifneq ($(tmake_file),) -include $(tmake_file) -endif +-include $(tmake_file) include $(top_srcdir)/../multilib.am diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 5455951..b570a94 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -1440,9 +1440,7 @@ stamp-build-info: libgomp.texi @touch $@ # target overrides -ifneq ($(tmake_file),) -include $(tmake_file) -endif +-include $(tmake_file) # GNU Make needs to see an explicit $(MAKE) variable in the command it # runs to enable its job server during parallel builds. Hence the |