From 9467ce42da7fbcec1a4b5b8e08e2dcea3c67aa96 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 20 Feb 2017 14:24:54 +0100 Subject: build: get rid of host.mk Defined required host related variables in toplevel.mk instead Signed-off-by: Felix Fietkau --- target/imagebuilder/Makefile | 1 - target/imagebuilder/files/Makefile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'target/imagebuilder') diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index f9dd61c031..e8e4641f67 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -7,7 +7,6 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index baa0e1f271..f0e2bd1281 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -13,7 +13,7 @@ export TOPDIR LC_ALL LANG export OPENWRT_VERBOSE=s all: help -include $(TOPDIR)/include/host.mk +export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH) ifneq ($(OPENWRT_BUILD),1) override OPENWRT_BUILD=1 @@ -82,7 +82,6 @@ PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ staging_dir/host/.prereq-build: include/prereq-build.mk mkdir -p tmp - rm -f tmp/.host.mk @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ -- cgit v1.2.3