commit d2b9ad4eb4c106dc068dd5a79d7802ec82f74af4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 16 19:39:00 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 16 19:39:00 2023 +0000
tree c44b56cb482b7310d7d5e394fef90b853d311ff3
parent 4e824bc8e830f38b73e7a05e505fa7e207d5ada8
parent a1d6109978e0df6daab08b75707e06fcc23913c5

Merge "Disable riscv64 dependency on bcc and ld.mc"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 25b66ea..22a69d8 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1345,6 +1345,13 @@
                   $(if $(ALL_MODULES.$(m).INSTALLED),\
                     $(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\
                       $(m))))
+    ifeq ($(TARGET_ARCH),riscv64)
+      # HACK: riscv64 can't build the device version of bcc and ld.mc due to a
+      # dependency on an old version of LLVM, but they are listed in
+      # base_system.mk which can't add them conditionally based on the target
+      # architecture.
+      _host_modules := $(filter-out bcc ld.mc,$(_host_modules))
+    endif
     $(call maybe-print-list-and-error,$(sort $(_host_modules)),\
       Host modules should be in PRODUCT_HOST_PACKAGES$(comma) not PRODUCT_PACKAGES)
   endif