Skip to content

Commit ce2fd53

Browse files
committed
kbuild: descend into scripts/gcc-plugins/ via scripts/Makefile
Now that 'archprepare' depends on 'scripts', Kbuild can descend into scripts/gcc-plugins in a more standard way. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Kees Cook <[email protected]>
1 parent 059bc9f commit ce2fd53

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
11101110

11111111
macroprepare: prepare1 archmacros
11121112

1113-
archprepare: archheaders archscripts macroprepare scripts gcc-plugins
1113+
archprepare: archheaders archscripts macroprepare scripts
11141114

11151115
prepare0: archprepare
11161116
$(Q)$(MAKE) $(build)=scripts/mod

scripts/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ PHONY += build_unifdef
3636
build_unifdef: $(obj)/unifdef
3737
@:
3838

39+
subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
3940
subdir-$(CONFIG_MODVERSIONS) += genksyms
4041
subdir-$(CONFIG_SECURITY_SELINUX) += selinux
4142
subdir-$(CONFIG_GDB_SCRIPTS) += gdb
4243

4344
# Let clean descend into subdirs
44-
subdir- += basic dtc kconfig mod package gcc-plugins
45+
subdir- += basic dtc kconfig mod package

scripts/Makefile.gcc-plugins

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,3 @@ KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
4949
# All enabled GCC plugins are collected here for building below.
5050
GCC_PLUGIN := $(gcc-plugin-y)
5151
export GCC_PLUGIN
52-
53-
# Actually do the build, if requested.
54-
PHONY += gcc-plugins
55-
gcc-plugins: scripts_basic
56-
ifdef CONFIG_GCC_PLUGINS
57-
$(Q)$(MAKE) $(build)=scripts/gcc-plugins
58-
endif
59-
@:

0 commit comments

Comments
 (0)