Message ID | 20190825172833.5708-2-yamada.masahiro@socionext.com |
---|---|
State | Accepted |
Commit | 521b29b6ff53aa642ca0964ad34c2ebcb8dbad14 |
Headers | show |
Series | [1/2] kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj) | expand |
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ef2f2336c469..1ce83269a5dc 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -144,7 +144,7 @@ help: # =========================================================================== # object files used by all kconfig flavours common-objs := confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \ - symbol.o + symbol.o util.o $(obj)/lexer.lex.o: $(obj)/parser.tab.h HOSTCFLAGS_lexer.lex.o := -I $(srctree)/$(src) diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y index 60936c76865b..b3eff9613cf8 100644 --- a/scripts/kconfig/parser.y +++ b/scripts/kconfig/parser.y @@ -727,5 +727,4 @@ void zconfdump(FILE *out) } } -#include "util.c" #include "menu.c"
util.c exists both in scripts/kconfig/ and scripts/kconfig/lxdialog. Previously, Kbuild could not pass different flags to source files with the same basename. Now that this issue was solved, you can split util.c out of parser.y and compile them independently of each other. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/kconfig/Makefile | 2 +- scripts/kconfig/parser.y | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.17.1