Re: [Qemu-devel] [RFC PATCH 2/3] tests/tcg: also pass AS and LD variables

[Alex Bennée]

Michael Walle <address@hidden> writes:

> The lm32 architecture doesn't need the complete compiler. In fact, only
> the building of GCC is skipped to make building the docker image faster.
>
> Signed-off-by: Michael Walle <address@hidden>
> ---
>  tests/tcg/Makefile.include | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include
> index 73b5626fc5..19b81400f5 100644
> --- a/tests/tcg/Makefile.include
> +++ b/tests/tcg/Makefile.include
> @@ -41,17 +41,26 @@ ifneq ($(DOCKER_IMAGE),)
>  # We also need the Docker make rules to depend on
>  include $(SRC_PATH)/tests/docker/Makefile.include
>
> -DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \
> +DOCKER_CC_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \
>               --cc $(DOCKER_CROSS_COMPILER) \
>               -i qemu:$(DOCKER_IMAGE) \
>               -s $(SRC_PATH) -- "
> +DOCKER_AS_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \
> +             --cc $(DOCKER_CROSS_ASSEMBLER) \
> +             -i qemu:$(DOCKER_IMAGE) \
> +             -s $(SRC_PATH) -- "
> +DOCKER_LD_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \
> +             --cc $(DOCKER_CROSS_LINKER) \
> +             -i qemu:$(DOCKER_IMAGE) \
> +             -s $(SRC_PATH) -- "
>  DOCKER_PREREQ=docker-image-$(DOCKER_IMAGE)
>
>  .PHONY: docker-build-guest-tests
>  docker-build-guest-tests: $(DOCKER_PREREQ)
>       $(call quiet-command, \
>         (mkdir -p tests && cd tests && \
> -        $(MAKE) -f $(TCG_MAKE) CC=$(DOCKER_COMPILE_CMD) \
> +        $(MAKE) -f $(TCG_MAKE) CC=$(DOCKER_CC_CMD) \
> +                     AS=$(DOCKER_AS_CMD) LD=$(DOCKER_LD_CMD) \

Hmm will these overrides break exiting builds? We haven't defined
DOCKER_CROSS_ASSEMBLER or DOCKER_CROSS_LINKER for all our targets.

>                       BUILD_STATIC=y \
>                       EXTRA_CFLAGS=$(DOCKER_CROSS_COMPILER_CFLAGS)), \
>       "BUILD","$(TARGET_NAME) guest-tests with docker qemu:$(DOCKER_IMAGE)")


--
Alex Bennée