On Thu, Nov 22, 2018 at 8:51 PM, Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> wrote: > Now that 'prepare0' depends on 'scripts', building GCC plugins can > go into scripts/Makefile, which is a more standard way. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> -Kees > --- > > Makefile | 2 +- > scripts/Makefile | 3 ++- > scripts/Makefile.gcc-plugins | 8 -------- > 3 files changed, 3 insertions(+), 10 deletions(-) > > diff --git a/Makefile b/Makefile > index cee4cec..a8bbe68 100644 > --- a/Makefile > +++ b/Makefile > @@ -1114,7 +1114,7 @@ macroprepare: prepare1 archmacros > > archprepare: archheaders archscripts macroprepare scripts_basic > > -prepare0: scripts archprepare gcc-plugins > +prepare0: scripts archprepare > $(Q)$(MAKE) $(build)=scripts/mod > $(Q)$(MAKE) $(build)=. > > diff --git a/scripts/Makefile b/scripts/Makefile > index b48259d..feb1f71 100644 > --- a/scripts/Makefile > +++ b/scripts/Makefile > @@ -36,9 +36,10 @@ PHONY += build_unifdef > build_unifdef: $(obj)/unifdef > @: > > +subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins > subdir-$(CONFIG_MODVERSIONS) += genksyms > subdir-$(CONFIG_SECURITY_SELINUX) += selinux > subdir-$(CONFIG_GDB_SCRIPTS) += gdb > > # Let clean descend into subdirs > -subdir- += basic dtc kconfig mod package gcc-plugins > +subdir- += basic dtc kconfig mod package > diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins > index 46c5c68..c36f199 100644 > --- a/scripts/Makefile.gcc-plugins > +++ b/scripts/Makefile.gcc-plugins > @@ -49,11 +49,3 @@ KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS) > # All enabled GCC plugins are collected here for building below. > GCC_PLUGIN := $(gcc-plugin-y) > export GCC_PLUGIN > - > -# Actually do the build, if requested. > -PHONY += gcc-plugins > -gcc-plugins: scripts_basic > -ifdef CONFIG_GCC_PLUGINS > - $(Q)$(MAKE) $(build)=scripts/gcc-plugins > -endif > - @: > -- > 2.7.4 > -- Kees Cook
