[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 1/1] Makefile: Capstone: Add support for cros
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-devel] [PATCH v1 1/1] Makefile: Capstone: Add support for cross compile ranlib |
Date: |
Wed, 8 Nov 2017 09:05:05 +0000 |
User-agent: |
Mutt/1.9.1 (2017-09-22) |
On Tue, Nov 07, 2017 at 05:10:46PM -0800, Alistair Francis wrote:
> When cross compiling QEMU for Windows we need to specify the cross
> version of ranlib to avoid build errors when buildling capstone. This
> patch ensures we use the same cross prefix on ranlib as other toolchain
> components.
>
> Signed-off-by: Alistair Francis <address@hidden>
> Suggested-by: Peter Maydell <address@hidden>
> ---
>
> Makefile | 2 +-
> configure | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrange <address@hidden>
>
> diff --git a/Makefile b/Makefile
> index 0496c5057a..814f6820d9 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -405,7 +405,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_POWERPC
> CAP_CFLAGS += -DCAPSTONE_HAS_X86
>
> subdir-capstone: .git-submodule-status
> - $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no
> BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)"
> CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS)
> $(BUILD_DIR)/capstone/$(LIBCAPSTONE))
> + $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no
> BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)"
> RANLIB="$(RANLIB)" CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS)
> $(BUILD_DIR)/capstone/$(LIBCAPSTONE))
>
> $(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \
> $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))
> diff --git a/configure b/configure
> index a6055c0710..0e856bbc04 100755
> --- a/configure
> +++ b/configure
> @@ -482,6 +482,7 @@ ccas="${CCAS-$cc}"
> cpp="${CPP-$cc -E}"
> objcopy="${OBJCOPY-${cross_prefix}objcopy}"
> ld="${LD-${cross_prefix}ld}"
> +ranlib="${RANLIB-${cross_prefix}ranlib}"
> nm="${NM-${cross_prefix}nm}"
> strip="${STRIP-${cross_prefix}strip}"
> windres="${WINDRES-${cross_prefix}windres}"
> @@ -6288,6 +6289,7 @@ echo "CCAS=$ccas" >> $config_host_mak
> echo "CPP=$cpp" >> $config_host_mak
> echo "OBJCOPY=$objcopy" >> $config_host_mak
> echo "LD=$ld" >> $config_host_mak
> +echo "RANLIB=$ranlib" >> $config_host_mak
> echo "NM=$nm" >> $config_host_mak
> echo "WINDRES=$windres" >> $config_host_mak
> echo "CFLAGS=$CFLAGS" >> $config_host_mak
> @@ -6782,6 +6784,7 @@ for rom in seabios vgabios ; do
> echo "OBJCOPY=objcopy" >> $config_mak
> echo "IASL=$iasl" >> $config_mak
> echo "LD=$ld" >> $config_mak
> + echo "RANLIB=$ranlib" >> $config_mak
> done
>
> # set up tests data directory
> --
> 2.11.0
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|