@@ -1,5 +1,6 @@
config BR2_PACKAGE_KVM_UNIT_TESTS
bool "kvm-unit-tests"
+ select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y
depends on BR2_arm || BR2_i386 || BR2_powerpc64 || \
BR2_powerpc64le || BR2_x86_64
help
@@ -10,14 +10,19 @@ KVM_UNIT_TESTS_SITE_METHOD = git
KVM_UNIT_TESTS_LICENSE = LGPLv2
KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT
+#Use HOSTCC for x86_64 as we'll need to compile 32bit code
+#which buildroot cross compilers often can't do
+ifeq ($(BR2_x86_64),y)
+KVM_UNIT_TESTS_ARCH = x86_84
+else
+KVM_UNIT_TESTS_CONF_OPTS = --cross-prefix="$(TARGET_CROSS)"
+endif
ifeq ($(BR2_arm),y)
KVM_UNIT_TESTS_ARCH = arm
else ifeq ($(BR2_i386),y)
KVM_UNIT_TESTS_ARCH = i386
else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y)
KVM_UNIT_TESTS_ARCH = ppc64
-else ifeq ($(BR2_x86_64),y)
-KVM_UNIT_TESTS_ARCH = x86_84
endif
ifeq ($(BR2_ENDIAN),"LITTLE")
@@ -26,9 +31,8 @@ else
KVM_UNIT_TESTS_ENDIAN = big
endif
-KVM_UNIT_TESTS_CONF_OPTS =\
+KVM_UNIT_TESTS_CONF_OPTS +=\
--arch="$(KERNEL_ARCH)" \
- --cross-prefix="$(TARGET_CROSS)" \
--endian="$(KVM_UNIT_TESTS_ENDIAN)"
define KVM_UNIT_TESTS_CONFIGURE_CMDS
kvm-unit-tests requires a multilib compiler for x86_64 as it compiles 32bit boot code. This patch uses the BR2_HOSTARCH_NEEDS_IA32_COMPILER option to enforce this and avoids using TARGET_CROSS for x86_64 targets and uses the host 32bit (and 64bit) capable compiler. Signed-off-by: Cyril Bur <cyrilbur@gmail.com> --- Should be able to be merged as is but I hope the RFC might attract more eyes as this has me in an x86 caveat world that I'm utterly unfamilair with. With this patch my Power build machine fails to build kvm-unit-tests for x86_64 (expected, I see the message about BR2_HOSTARCH_NEEDS_IA32_COMPILER) and has no problems building for ARM. My x86_64 build machine can build for x86_64 and still build other architectures. package/kvm-unit-tests/Config.in | 1 + package/kvm-unit-tests/kvm-unit-tests.mk | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-)