StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4 am: 01321a6bb2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665

Change-Id: I498a9489ef3332f29aba7ffe641103185efa234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-16 20:58:38 +00:00
committed by Automerger Merge Worker
parent 58230623d7 01321a6bb2
commit cdbc794cd9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/main.mk
View File

@@ -1345,6 +1345,13 @@ else ifdef FULL_BUILD
$(if $(ALL_MODULES.$(m).INSTALLED),\ $(if $(ALL_MODULES.$(m).INSTALLED),\
$(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\ $(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\
$(m)))) $(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)),\ $(call maybe-print-list-and-error,$(sort $(_host_modules)),\
Host modules should be in PRODUCT_HOST_PACKAGES$(comma) not PRODUCT_PACKAGES) Host modules should be in PRODUCT_HOST_PACKAGES$(comma) not PRODUCT_PACKAGES)
endif endif