From 3c0046759e5a2b920739dac038eaae9bedd6651d Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 24 Aug 2018 17:22:12 +0000 Subject: [PATCH] profiles: Disable arm64 support in QEMU and Rust Since the kernel is no longer buildable for arm64, disable the QEMU targets that were used by dracut to create the arm64 initramfs. Also disable LLVM's arm64 support to speed up SDK Rust builds. --- .../profiles/coreos/targets/sdk/make.defaults | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults index 84da663059..444b093ec8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults @@ -8,13 +8,10 @@ CROS_SDK_HOST="cros-sdk-host" GRUB_PLATFORMS="efi-64 pc xen" # Enable CPU architectures needed by Rust builds -LLVM_TARGETS="X86 AArch64" +LLVM_TARGETS="X86" # Both x86_64 and i386 targets are required for grub testing -QEMU_SOFTMMU_TARGETS="x86_64 i386 aarch64" - -# For cross build support. -QEMU_USER_TARGETS="aarch64" +QEMU_SOFTMMU_TARGETS="x86_64 i386" # Disable ccache in the SDK so it stops randomly breaking catalyst. FEATURES="-ccache"