Commit 9f81aeb5 authored by Alistair Francis's avatar Alistair Francis Committed by Richard Henderson
Browse files

Makefile: Capstone: Add support for cross compile ranlib 



When cross compiling QEMU for Windows we need to specify the cross
version of ranlib to avoid build errors when building capstone. This
patch ensures we use the same cross prefix on ranlib as other toolchain
components.

- Fedora23 mingw
- RHEL-7.2 with mingw packages from epel:

   LINK    qemu-img.exe
 build-win64/capstone/capstone.lib: error adding symbols: Archive has no
index; run ranlib to add one
 collect2: error: ld returned 1 exit status

$ x86_64-w64-mingw32-ar --version
GNU ar (GNU Binutils) 2.25

Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Suggested-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-Id: <e457d4e906dceea4de6c3431813a06b137c1ab9c.1510103351.git.alistair.francis@xilinx.com>
Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 15fa1a0a

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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))

configure

+3 −0
Original line number Diff line number Diff line
@@ -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