summaryrefslogtreecommitdiffstats
path: root/target/imagebuilder
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-20 14:24:54 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-26 13:31:44 +0100
commit9467ce42da7fbcec1a4b5b8e08e2dcea3c67aa96 (patch)
treec3d4f2ab3090a91a89fd731a2499aa341e3cc1e8 /target/imagebuilder
parentbe206eba3a57128695a00f490767e5c136e43ab7 (diff)
downloadopenwrt-9467ce42da7fbcec1a4b5b8e08e2dcea3c67aa96.tar.gz
openwrt-9467ce42da7fbcec1a4b5b8e08e2dcea3c67aa96.tar.bz2
openwrt-9467ce42da7fbcec1a4b5b8e08e2dcea3c67aa96.zip
build: get rid of host.mk
Defined required host related variables in toplevel.mk instead Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/imagebuilder')
-rw-r--r--target/imagebuilder/Makefile1
-rw-r--r--target/imagebuilder/files/Makefile3
2 files changed, 1 insertions, 3 deletions
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; \