Skip to content

Commit c1c0741

Browse files
committed
Merge tag 'kbuild-fixes-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada: - remove state comment in modpost - extend MAINTAINERS entry to cover modpost and more makefiles - fix missed building of SANCOV gcc-plugin - replace left-over 'bison' with $(YACC) - display short log when generating parer of genksyms * tag 'kbuild-fixes-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: genksyms: fix typo in parse.tab.{c,h} generation rules kbuild: replace hardcoded bison in cmd_bison_h with $(YACC) gcc-plugins: fix build condition of SANCOV plugin MAINTAINERS: Update Kbuild entry with a few paths modpost: delete stale comment
2 parents 4a7a772 + 0da7e43 commit c1c0741

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

MAINTAINERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7667,9 +7667,11 @@ L: [email protected]
76677667
S: Maintained
76687668
F: Documentation/kbuild/
76697669
F: Makefile
7670-
F: scripts/Makefile.*
7670+
F: scripts/Kbuild*
7671+
F: scripts/Makefile*
76717672
F: scripts/basic/
76727673
F: scripts/mk*
7674+
F: scripts/mod/
76737675
F: scripts/package/
76747676

76757677
KERNEL JANITORS

scripts/Makefile.gcc-plugins

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifdef CONFIG_GCC_PLUGINS
1414
endif
1515

1616
ifdef CONFIG_GCC_PLUGIN_SANCOV
17-
ifeq ($(CFLAGS_KCOV),)
17+
ifeq ($(strip $(CFLAGS_KCOV)),)
1818
# It is needed because of the gcc-plugin.sh and gcc version checks.
1919
gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV) += sancov_plugin.so
2020

scripts/Makefile.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ $(obj)/%.tab.c: $(src)/%.y FORCE
196196
$(call if_changed,bison)
197197

198198
quiet_cmd_bison_h = YACC $@
199-
cmd_bison_h = bison -o/dev/null --defines=$@ -t -l $<
199+
cmd_bison_h = $(YACC) -o/dev/null --defines=$@ -t -l $<
200200

201201
$(obj)/%.tab.h: $(src)/%.y FORCE
202202
$(call if_changed,bison_h)

scripts/genksyms/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ genksyms-objs := genksyms.o parse.tab.o lex.lex.o
1414
# so that 'bison: not found' will be displayed if it is missing.
1515
ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),)
1616

17-
quiet_cmd_bison_no_warn = $(quet_cmd_bison)
17+
quiet_cmd_bison_no_warn = $(quiet_cmd_bison)
1818
cmd_bison_no_warn = $(YACC) --version >/dev/null; \
1919
$(cmd_bison) 2>/dev/null
2020

2121
$(obj)/parse.tab.c: $(src)/parse.y FORCE
2222
$(call if_changed,bison_no_warn)
2323

24-
quiet_cmd_bison_h_no_warn = $(quet_cmd_bison_h)
24+
quiet_cmd_bison_h_no_warn = $(quiet_cmd_bison_h)
2525
cmd_bison_h_no_warn = $(YACC) --version >/dev/null; \
2626
$(cmd_bison_h) 2>/dev/null
2727

scripts/mod/sumversion.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
330330
goto out;
331331
}
332332

333-
/* There will be a line like so:
334-
deps_drivers/net/dummy.o := \
335-
drivers/net/dummy.c \
336-
$(wildcard include/config/net/fastroute.h) \
337-
include/linux/module.h \
338-
339-
Sum all files in the same dir or subdirs.
340-
*/
333+
/* Sum all files in the same dir or subdirs. */
341334
while ((line = get_next_line(&pos, file, flen)) != NULL) {
342335
char* p = line;
343336

0 commit comments

Comments
 (0)