5ae6fcc4bb
When recursive inclusion is detected, the line number of the last 'included from:' is wrong. [Test Case] Kconfig: -------->8-------- source "Kconfig2" -------->8-------- Kconfig2: -------->8-------- source "Kconfig3" -------->8-------- Kconfig3: -------->8-------- source "Kconfig" -------->8-------- [Result] $ make allyesconfig scripts/kconfig/conf --allyesconfig Kconfig Kconfig:1: recursive inclusion detected. Inclusion path: current file : 'Kconfig' included from: 'Kconfig3:1' included from: 'Kconfig2:1' included from: 'Kconfig:3' scripts/kconfig/Makefile:89: recipe for target 'allyesconfig' failed make[1]: *** [allyesconfig] Error 1 Makefile:512: recipe for target 'allyesconfig' failed make: *** [allyesconfig] Error 2 where we expect current file : 'Kconfig' included from: 'Kconfig3:1' included from: 'Kconfig2:1' included from: 'Kconfig:1' The 'iter->lineno+1' in the second fpinrtf() should be 'iter->lineno-1'. I refactored the code to merge the two fprintf() calls. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Ulf Magnusson <ulfalizer@gmail.com> |
||
---|---|---|
.. | ||
lxdialog | ||
.gitignore | ||
check.sh | ||
conf.c | ||
confdata.c | ||
expr.c | ||
expr.h | ||
gconf.c | ||
gconf.glade | ||
images.c | ||
kconf_id.c | ||
kxgettext.c | ||
list.h | ||
lkc.h | ||
lkc_proto.h | ||
Makefile | ||
mconf.c | ||
menu.c | ||
merge_config.sh | ||
nconf.c | ||
nconf.gui.c | ||
nconf.h | ||
POTFILES.in | ||
qconf.cc | ||
qconf.h | ||
streamline_config.pl | ||
symbol.c | ||
util.c | ||
zconf.l | ||
zconf.y |