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

Merge changes Ib89ef776,I5cdc56c7 am: 2dcabab1c9

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

Change-Id: I3d34302b4c014484a8116fe8442d2a878d7d15ab
This commit is contained in:
Yo Chiang
2020-08-12 04:08:10 +00:00
committed by Automerger Merge Worker
parent b37bb1d8c6 2dcabab1c9
commit 02e56fc624
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -695,6 +695,9 @@ $(call select-bitness-of-target-host-required-modules,TARGET,HOST)
$(call select-bitness-of-target-host-required-modules,HOST,TARGET) $(call select-bitness-of-target-host-required-modules,HOST,TARGET)
_nonexistent_required := $(sort $(_nonexistent_required)) _nonexistent_required := $(sort $(_nonexistent_required))
# HOST OS darwin build is broken, disable this check for darwin for now.
# TODO(b/162102724): Remove this
ifeq (,$(filter $(HOST_OS),darwin))
ifeq (,$(filter true,$(ALLOW_MISSING_DEPENDENCIES) $(BUILD_BROKEN_MISSING_REQUIRED_MODULES))) ifeq (,$(filter true,$(ALLOW_MISSING_DEPENDENCIES) $(BUILD_BROKEN_MISSING_REQUIRED_MODULES)))
ifneq (,$(_nonexistent_required)) ifneq (,$(_nonexistent_required))
$(warning Missing required dependencies:) $(warning Missing required dependencies:)
@@ -706,6 +709,7 @@ ifneq (,$(_nonexistent_required))
$(error Build failed) $(error Build failed)
endif # _nonexistent_required != empty endif # _nonexistent_required != empty
endif # ALLOW_MISSING_DEPENDENCIES != true && BUILD_BROKEN_MISSING_REQUIRED_MODULES != true endif # ALLOW_MISSING_DEPENDENCIES != true && BUILD_BROKEN_MISSING_REQUIRED_MODULES != true
endif # HOST_OS != darwin
define add-required-deps define add-required-deps
$(1): | $(2) $(1): | $(2)