Skip to content

Commit d072ba9

Browse files
committed
Support building Trusty with bear
1 parent 4b8ac4b commit d072ba9

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ VERBOSE ?= 0
1616

1717
ARCH ?= x86_64
1818

19+
BEAR ?= 0
20+
1921
GREEN := $(shell tput setaf 2)
2022
YELLOW := $(shell tput setaf 3)
2123
NC := $(shell tput sgr0)
@@ -405,6 +407,11 @@ ATF_DIR := $(TRUSTY_OUT)/atf/qemu/debug
405407
ATF_BL1 := $(ATF_DIR)/bl1.bin
406408
ATF_BL33 := $(ATF_DIR)/bl33.bin
407409

410+
BEAR_CMD :=
411+
ifeq ($(BEAR),1)
412+
BEAR_CMD := bear --
413+
endif
414+
408415
.PHONY: trusty-init
409416
trusty-init:
410417
mkdir -p $(TRUSTY_SRC)
@@ -413,7 +420,9 @@ trusty-init:
413420

414421
.PHONY: trusty
415422
trusty $(ATF_BL1): | $(TRUSTY_SRC)
416-
$(TRUSTY_SRC)/trusty/vendor/google/aosp/scripts/build.py --build-root $(TRUSTY_BUILD_ROOT) --skip-tests $(TRUSTY_TARGET)
423+
$(BEAR_CMD) $(TRUSTY_SRC)/trusty/vendor/google/aosp/scripts/build.py \
424+
--build-root $(TRUSTY_BUILD_ROOT) \
425+
--skip-tests $(TRUSTY_TARGET)
417426
$(MAKE) trusty_bl33
418427

419428
.PHONY: trusty_bl33

0 commit comments

Comments
 (0)