On Tue, Oct 3, 2017 at 1:48 PM, Douglas Anderson <diand...@chromium.org> wrote:
> If the top-level tools build is called to build a tool and is passed
> CC, AS, or LD on the command line then someone wants to use a
> different compiler, assembler, or linker. Let's honor that.
>
> This together with the change ("kbuild: Pass HOSTCC and similar to
> tools Makefiles") allows us to properly get the HOST C Compiler used
> when the main kernel Makefile calls into the tools.
>
> Signed-off-by: Douglas Anderson <diand...@chromium.org>
> ---
>
> tools/scripts/Makefile.include | 22 ++++++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
> index 9dc8f078a83c..00261848ec54 100644
> --- a/tools/scripts/Makefile.include
> +++ b/tools/scripts/Makefile.include
> @@ -10,6 +10,20 @@ endif
> endif
> endif
>
> +SUBMAKE_ARGS :=
> +
> +# If CC, LD, or AR were passed on the command line, pass them through to the
> +# command line of the sub-tools.
> +ifeq ($(origin CC), command line)
> + SUBMAKE_ARGS += "CC=$(CC)"
> +endif
> +ifeq ($(origin LD), command line)
> + SUBMAKE_ARGS += "LD=$(LD)"
> +endif
> +ifeq ($(origin AR), command line)
> + SUBMAKE_ARGS += "AR=$(ar)"
s/ar/AR/ ?
> +endif
> +
> # check that the output directory actually exists
> ifneq ($(OUTPUT),)
> OUTDIR := $(realpath $(OUTPUT))
> @@ -71,7 +85,9 @@ endif
> #
> descend = \
> +mkdir -p $(OUTPUT)$(1) && \
> - $(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1))
> $(PRINT_DIR) -C $(1) $(2)
> + $(MAKE) $(SUBMAKE_ARGS) $(COMMAND_O) \
> + subdir=$(if $(subdir),$(subdir)/$(1),$(1)) \
> + $(PRINT_DIR) -C $(1) $(2)
>
> QUIET_SUBDIR0 = +$(MAKE) $(COMMAND_O) -C # space to separate -C and subdir
> QUIET_SUBDIR1 =
> @@ -94,7 +110,9 @@ ifneq ($(silent),1)
> descend = \
> +@echo ' DESCEND '$(1); \
> mkdir -p $(OUTPUT)$(1) && \
> - $(MAKE) $(COMMAND_O) subdir=$(if
> $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2)
> + $(MAKE) $(SUBMAKE_ARGS) $(COMMAND_O) \
> + subdir=$(if $(subdir),$(subdir)/$(1),$(1)) \
> + $(PRINT_DIR) -C $(1) $(2)
>
> QUIET_CLEAN = @printf ' CLEAN %s\n' $1;
> QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
> --
> 2.14.2.920.gcf0c67979c-goog
>
