diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-12-16 00:28:42 +0900 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2018-07-10 14:25:20 +1200 |
| commit | eef8eb403340ffb651f1b0067b0daa3fc7d7b7bf (patch) | |
| tree | abcc8d7dcfbf0c38ba3fc1270f91d61650172c0c /kconfig | |
| parent | d5900debd397b8909d9cafeb9a1093fb7a5dc6e6 (diff) | |
| download | crosstool-ng-eef8eb403340ffb651f1b0067b0daa3fc7d7b7bf.tar.gz crosstool-ng-eef8eb403340ffb651f1b0067b0daa3fc7d7b7bf.tar.bz2 crosstool-ng-eef8eb403340ffb651f1b0067b0daa3fc7d7b7bf.zip | |
kconfig: display recursive dependency resolution hint just once
Commit 1c199f2878f6 ("kbuild: document recursive dependency limitation
/ resolution") probably intended to show a hint along with "recursive
dependency detected!" error, but it missed to add {...} guard, and the
hint is displayed in every loop of the dep_stack traverse, annoyingly.
This error was detected by GCC's -Wmisleading-indentation when switching
to build-time generation of lexer/parser.
scripts/kconfig/symbol.c: In function ‘sym_check_print_recursive’:
scripts/kconfig/symbol.c:1150:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
if (stack->sym == last_sym)
^~
scripts/kconfig/symbol.c:1153:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
fprintf(stderr, "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n");
^~~~~~~
I could simply add {...} to surround the three fprintf(), but I rather
chose to move the hint after the loop to make the whole message readable.
Fixes: 1c199f2878f6 ("kbuild: document recursive dependency limitation / resolution"
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
[upstream commit e3b03bf29d6b99fab7001fb20c33fe54928c157a]
Fixes #1000
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig')
| -rw-r--r-- | kconfig/symbol.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kconfig/symbol.c b/kconfig/symbol.c index 3c8bd9bb..35e0937a 100644 --- a/kconfig/symbol.c +++ b/kconfig/symbol.c @@ -1150,8 +1150,7 @@ static void sym_check_print_recursive(struct symbol *last_sym) if (stack->sym == last_sym) fprintf(stderr, "%s:%d:error: recursive dependency detected!\n", prop->file->name, prop->lineno); - fprintf(stderr, "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n"); - fprintf(stderr, "subsection \"Kconfig recursive dependency limitations\"\n"); + if (stack->expr) { fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n", prop->file->name, prop->lineno, @@ -1181,6 +1180,11 @@ static void sym_check_print_recursive(struct symbol *last_sym) } } + fprintf(stderr, + "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n" + "subsection \"Kconfig recursive dependency limitations\"\n" + "\n"); + if (check_top == &cv_stack) dep_stack_remove(); } |