From e5bd83f4aa462f943a09883e1934cd5b8e7341dd Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 26 Apr 2017 16:08:43 -0400 Subject: build: build host-tools when prebuilts are enabled The build process of the host tools requires fixdep, when prebuilt host tools are enabled and no host-tools are available (i.e. after a 'make mrproper'), the build would fail because of the dependency. So make sure we point to the in tree fixdep binary when building. Change-Id: I8311f870d90b32ba56c821bb8533379f57003a8d Signed-off-by: Anas Nashif --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2ba656f2e..fb19e6e81 100644 --- a/Makefile +++ b/Makefile @@ -323,8 +323,12 @@ GENOFFSET_H = scripts/gen_offset_header/gen_offset_header FIXDEP = scripts/basic/fixdep else GENOFFSET_H = $(PREBUILT_HOST_TOOLS)/gen_offset_header +ifneq ($(filter host-tools, $(MAKECMDGOALS)),) +FIXDEP = scripts/basic/fixdep +else FIXDEP = $(PREBUILT_HOST_TOOLS)/fixdep endif +endif PERL = perl PYTHON = python CHECK = sparse @@ -1195,8 +1199,8 @@ $(help-board-dirs): help-%: host-tools: - $(Q)$(MAKE) $(build)=scripts/kconfig standalone $(Q)$(MAKE) $(build)=scripts/basic + $(Q)$(MAKE) $(build)=scripts/kconfig standalone $(Q)$(MAKE) $(build)=scripts/gen_idt $(Q)$(MAKE) $(build)=scripts/gen_offset_header @mkdir -p ${ZEPHYR_BASE}/bin -- cgit v1.2.3