On 31/05/2017 15:09, Greg Kurz wrote:
> The docker-run-test-build@debian-s390x-cross target fails with:
>
> strip --strip-unneeded s390-ccw.elf -o s390-ccw.img
> strip: Unable to recognise the format of the input file `s390-ccw.elf'
>
> The configure script defines a STRIP makefile variable whose default
> value is ${cross_prefix}strip. Let's use it.
>
> We default to using the non-prefixed strip command in case --enable-debug
> or --disable-strip was passed to configure during a regular build.
>
> Signed-off-by: Greg Kurz <gr...@kaod.org>
> ---
> v2: - added default value
> - no longer Cc: qemu-trivial as it turned out to be not that trivial
>
> Philippe,
>
> Please give your Reviewed-by again if you're okay with this change.
> ---
> pc-bios/s390-ccw/Makefile | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> index 79a46b67356f..fb88c13bc742 100644
> --- a/pc-bios/s390-ccw/Makefile
> +++ b/pc-bios/s390-ccw/Makefile
> @@ -21,8 +21,10 @@ build-all: s390-ccw.img
> s390-ccw.elf: $(OBJECTS)
> $(call quiet-command,$(CC) $(LDFLAGS) -o $@
> $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
>
> +STRIP ?= strip
> +
> s390-ccw.img: s390-ccw.elf
> - $(call quiet-command,strip --strip-unneeded $< -o
> $@,"STRIP","$(TARGET_DIR)$@")
> + $(call quiet-command,$(STRIP) --strip-unneeded $< -o
> $@,"STRIP","$(TARGET_DIR)$@")
>
> $(OBJECTS): Makefile
>
>
>
Reviewed-by: Laurent Vivier <lviv...@redhat.com>
