diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-05-06 03:20:10 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2007-05-06 03:20:10 -0400 |
commit | 5447d34b080a1e3e312b05a91e87eff4710a1152 (patch) | |
tree | 0e232d4f5fa7116fb48ca39ce1dc8dcbdeec0187 /scripts/kconfig/symbol.c | |
parent | 04c58f8196b386948abf68128605de3d2db3c6ba (diff) |
kconfig: error out if recursive dependencies are found
Sample:
config FOO
bool "This is foo"
depends on BAR
config BAR
bool "This is bar"
depends on FOO
This will result in following error message:
error: found recursive dependency: FOO -> BAR -> FOO
And will then exit with exit code equal 1 so make will stop.
Inspired by patch from: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Adrian Bunk <bunk@stusta.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Diffstat (limited to 'scripts/kconfig/symbol.c')
-rw-r--r-- | scripts/kconfig/symbol.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 8f06c474d800..c35dcc5d6189 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c | |||
@@ -786,13 +786,15 @@ static struct symbol *sym_check_expr_deps(struct expr *e) | |||
786 | return NULL; | 786 | return NULL; |
787 | } | 787 | } |
788 | 788 | ||
789 | /* return NULL when dependencies are OK */ | ||
789 | struct symbol *sym_check_deps(struct symbol *sym) | 790 | struct symbol *sym_check_deps(struct symbol *sym) |
790 | { | 791 | { |
791 | struct symbol *sym2; | 792 | struct symbol *sym2; |
792 | struct property *prop; | 793 | struct property *prop; |
793 | 794 | ||
794 | if (sym->flags & SYMBOL_CHECK) { | 795 | if (sym->flags & SYMBOL_CHECK) { |
795 | printf("Warning! Found recursive dependency: %s", sym->name); | 796 | fprintf(stderr, "%s:%d:error: found recursive dependency: %s", |
797 | sym->prop->file->name, sym->prop->lineno, sym->name); | ||
796 | return sym; | 798 | return sym; |
797 | } | 799 | } |
798 | if (sym->flags & SYMBOL_CHECKED) | 800 | if (sym->flags & SYMBOL_CHECKED) |
@@ -816,13 +818,8 @@ struct symbol *sym_check_deps(struct symbol *sym) | |||
816 | goto out; | 818 | goto out; |
817 | } | 819 | } |
818 | out: | 820 | out: |
819 | if (sym2) { | 821 | if (sym2) |
820 | printf(" %s", sym->name); | 822 | fprintf(stderr, " -> %s%s", sym->name, sym2 == sym? "\n": ""); |
821 | if (sym2 == sym) { | ||
822 | printf("\n"); | ||
823 | sym2 = NULL; | ||
824 | } | ||
825 | } | ||
826 | sym->flags &= ~SYMBOL_CHECK; | 823 | sym->flags &= ~SYMBOL_CHECK; |
827 | return sym2; | 824 | return sym2; |
828 | } | 825 | } |