michaelh/zephyr
1
0
Fork 0
Code Releases Activity

build: build host-tools when prebuilts are enabled

Browse source 
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 <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-04-26 16:08:43 -04:00
commit e5bd83f4aa
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -323,8 +323,12 @@ GENOFFSET_H = scripts/gen_offset_header/gen_offset_header
FIXDEP = scripts/basic/fixdep FIXDEP = scripts/basic/fixdep
else else
GENOFFSET_H = $(PREBUILT_HOST_TOOLS)/gen_offset_header GENOFFSET_H = $(PREBUILT_HOST_TOOLS)/gen_offset_header
ifneq ($(filter host-tools, $(MAKECMDGOALS)),)
FIXDEP = scripts/basic/fixdep
else
FIXDEP = $(PREBUILT_HOST_TOOLS)/fixdep FIXDEP = $(PREBUILT_HOST_TOOLS)/fixdep
endif endif
endif
PERL = perl PERL = perl
PYTHON = python PYTHON = python
CHECK = sparse CHECK = sparse
@ -1195,8 +1199,8 @@ $(help-board-dirs): help-%:
host-tools: host-tools:
$(Q)$(MAKE) $(build)=scripts/kconfig standalone
$(Q)$(MAKE) $(build)=scripts/basic $(Q)$(MAKE) $(build)=scripts/basic
$(Q)$(MAKE) $(build)=scripts/kconfig standalone
$(Q)$(MAKE) $(build)=scripts/gen_idt $(Q)$(MAKE) $(build)=scripts/gen_idt
$(Q)$(MAKE) $(build)=scripts/gen_offset_header $(Q)$(MAKE) $(build)=scripts/gen_offset_header
@mkdir -p ${ZEPHYR_BASE}/bin @mkdir -p ${ZEPHYR_BASE}/bin