diff options
| author | Nathan Sidwell <nathan@acm.org> | 2020-11-03 04:59:48 -0800 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2020-11-03 05:16:19 -0800 |
| commit | 918e8b10a716ec720215afafb7baa1b9b75e4fa1 (patch) | |
| tree | 48548ad8236285ceca1910f4a6413b1c99126891 /libcpp/include | |
| parent | f7d6961126a7f06c8089d8a58bd21be43bc16806 (diff) | |
| download | gcc-918e8b10a716ec720215afafb7baa1b9b75e4fa1.zip gcc-918e8b10a716ec720215afafb7baa1b9b75e4fa1.tar.gz gcc-918e8b10a716ec720215afafb7baa1b9b75e4fa1.tar.bz2 | |
libcpp: dependency emission tidying
This patch cleans up the interface to the dependency generation a
little. We now only check the option in one place, and the
cpp_get_deps function returns nullptr if there are no dependencies. I
also reworded the -MT and -MQ help text to be make agnostic -- as
there are ideas about emitting, say, JSON.
libcpp/
* include/mkdeps.h: Include cpplib.h
(deps_write): Adjust first parm type.
* mkdeps.c: Include internal.h
(make_write): Adjust first parm type. Check phony option
directly.
(deps_write): Adjust first parm type.
* init.c (cpp_read_main_file): Use get_deps.
* directives.c (cpp_get_deps): Check option before initializing.
gcc/c-family/
* c.opt (MQ,MT): Reword description to be make-agnostic.
gcc/fortran/
* cpp.c (gfc_cpp_add_dep): Only add dependency if we're recording
them.
(gfc_cpp_init): Likewise for target.
Diffstat (limited to 'libcpp/include')
| -rw-r--r-- | libcpp/include/mkdeps.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcpp/include/mkdeps.h b/libcpp/include/mkdeps.h index 6d05351..593b718 100644 --- a/libcpp/include/mkdeps.h +++ b/libcpp/include/mkdeps.h @@ -23,6 +23,8 @@ along with this program; see the file COPYING3. If not see #ifndef LIBCPP_MKDEPS_H #define LIBCPP_MKDEPS_H +#include "cpplib.h" + /* This is the data structure used by all the functions in mkdeps.c. It's quite straightforward, but should be treated as opaque. */ @@ -55,9 +57,9 @@ extern void deps_add_default_target (class mkdeps *, const char *); dependency entered should be the primary source file. */ extern void deps_add_dep (class mkdeps *, const char *); -/* Write out a deps buffer to a specified file. The third argument +/* Write out a deps buffer to a specified file. The last argument is the number of columns to word-wrap at (0 means don't wrap). */ -extern void deps_write (const class mkdeps *, FILE *, bool, unsigned int); +extern void deps_write (const cpp_reader *, FILE *, unsigned int); /* Write out a deps buffer to a file, in a form that can be read back with deps_restore. Returns nonzero on error, in which case the |