[v2,1/2] kbuild: make 'archprepare' depend on 'scripts'

Before start descending, Kbuild needs to run 'prepare' and 'scripts',
which has been orthogonal to each other.

Going forward, let's consider 'scripts' is a part of the preparation.
This will allow more cleanups.

Move 'scripts' to the prerequisite of 'archprepare', where UML starts
compiling target *.c files.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

Changes in v2:
  - It turned out UML + CONFIG_GCC_PLUGINS is broken for a long time.
    https://patchwork.kernel.org/patch/10703853/
    Rebased on the top of the fix-up

 Makefile | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

-- 
2.7.4

On Thu, Nov 29, 2018 at 12:57 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>

> Before start descending, Kbuild needs to run 'prepare' and 'scripts',

> which has been orthogonal to each other.

>

> Going forward, let's consider 'scripts' is a part of the preparation.

> This will allow more cleanups.

>

> Move 'scripts' to the prerequisite of 'archprepare', where UML starts

> compiling target *.c files.

>

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> ---

>

> Changes in v2:

>   - It turned out UML + CONFIG_GCC_PLUGINS is broken for a long time.

>     https://patchwork.kernel.org/patch/10703853/

>     Rebased on the top of the fix-up


Applied to linux-kbuild.


>  Makefile | 32 +++++++++++++++-----------------

>  1 file changed, 15 insertions(+), 17 deletions(-)

>

> diff --git a/Makefile b/Makefile

> index f7cc3ee..9eb3f4f 100644

> --- a/Makefile

> +++ b/Makefile

> @@ -1062,7 +1062,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;

>  # Error messages still appears in the original language

>

>  PHONY += $(vmlinux-dirs)

> -$(vmlinux-dirs): prepare scripts

> +$(vmlinux-dirs): prepare

>         $(Q)$(MAKE) $(build)=$@ need-builtin=1

>

>  define filechk_kernel.release

> @@ -1112,7 +1112,7 @@ prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h

>

>  macroprepare: prepare1 archmacros

>

> -archprepare: archheaders archscripts macroprepare scripts_basic gcc-plugins

> +archprepare: archheaders archscripts macroprepare scripts gcc-plugins

>

>  prepare0: archprepare

>         $(Q)$(MAKE) $(build)=scripts/mod

> @@ -1286,7 +1286,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)

>

>  # Target to prepare building external modules

>  PHONY += modules_prepare

> -modules_prepare: prepare scripts

> +modules_prepare: prepare

>

>  # Target to install modules

>  PHONY += modules_install

> @@ -1604,11 +1604,9 @@ help:

>         @echo  '  clean           - remove generated files in module directory only'

>         @echo  ''

>

> -# Dummies...

> -PHONY += prepare scripts

> +PHONY += prepare

>  prepare:

>         $(cmd_crmodverdir)

> -scripts: ;

>  endif # KBUILD_EXTMOD

>

>  clean: $(clean-dirs)

> @@ -1712,33 +1710,33 @@ else

>          target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))

>  endif

>

> -%.s: %.c prepare scripts FORCE

> +%.s: %.c prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

> -%.i: %.c prepare scripts FORCE

> +%.i: %.c prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

> -%.o: %.c prepare scripts FORCE

> +%.o: %.c prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

> -%.lst: %.c prepare scripts FORCE

> +%.lst: %.c prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

> -%.s: %.S prepare scripts FORCE

> +%.s: %.S prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

> -%.o: %.S prepare scripts FORCE

> +%.o: %.S prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

> -%.symtypes: %.c prepare scripts FORCE

> +%.symtypes: %.c prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

> -%.ll: %.c prepare scripts FORCE

> +%.ll: %.c prepare FORCE

>         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

>

>  # Modules

> -/: prepare scripts FORCE

> +/: prepare FORCE

>         $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

>         $(build)=$(build-dir)

>  # Make sure the latest headers are built for Documentation

>  Documentation/ samples/: headers_install

> -%/: prepare scripts FORCE

> +%/: prepare FORCE

>         $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

>         $(build)=$(build-dir)

> -%.ko: prepare scripts FORCE

> +%.ko: prepare FORCE

>         $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \

>         $(build)=$(build-dir) $(@:.ko=.o)

>         $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

> --

> 2.7.4

>



-- 
Best Regards
Masahiro Yamada