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/directives.c | |
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/directives.c')
-rw-r--r-- | libcpp/directives.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcpp/directives.c b/libcpp/directives.c index d7b59aa..4295a67 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -2572,7 +2572,7 @@ cpp_set_callbacks (cpp_reader *pfile, cpp_callbacks *cb) class mkdeps * cpp_get_deps (cpp_reader *pfile) { - if (!pfile->deps) + if (!pfile->deps && CPP_OPTION (pfile, deps.style) != DEPS_NONE) pfile->deps = deps_init (); return pfile->deps; } |