diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/imagebuilder/Makefile | 1 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 3 | ||||
| -rw-r--r-- | target/linux/apm821xx/image/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/brcm2708/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/brcm2708/image/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/sunxi/image/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/uml/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/zynq/Makefile | 1 | ||||
| -rw-r--r-- | target/sdk/Makefile | 1 | ||||
| -rw-r--r-- | target/sdk/files/Makefile | 2 | ||||
| -rw-r--r-- | target/toolchain/Makefile | 1 |
11 files changed, 2 insertions, 12 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; \ diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index a11e989705..355333695d 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -4,7 +4,6 @@ # include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -include $(INCLUDE_DIR)/host.mk DEVICE_VARS += DEVICE_PROFILE IMAGE_SIZE DTB_SIZE diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index 07574f9815..8dc923907d 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -5,7 +5,6 @@ # See /LICENSE for more information. # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/host.mk ARCH:=arm BOARD:=brcm2708 diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index dbe014565e..0b3f6a7588 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -7,7 +7,6 @@ # include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -include $(INCLUDE_DIR)/host.mk FAT32_BLOCK_SIZE=1024 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index c3f368f2e4..d0d86ee10d 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -7,7 +7,6 @@ # include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -include $(INCLUDE_DIR)/host.mk FAT32_BLOCK_SIZE=1024 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 7cf1614218..6967e403cb 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -5,7 +5,6 @@ # See /LICENSE for more information. # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/host.mk # UML only makes sense on linux ifeq ($(HOST_OS),Linux) diff --git a/target/linux/zynq/Makefile b/target/linux/zynq/Makefile index 47b678ddbd..82b5d36942 100644 --- a/target/linux/zynq/Makefile +++ b/target/linux/zynq/Makefile @@ -5,7 +5,6 @@ # See /LICENSE for more information. # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/host.mk ARCH:=arm BOARD:=zynq diff --git a/target/sdk/Makefile b/target/sdk/Makefile index a1b64155bb..ae65fd1c8f 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -8,7 +8,6 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/version.mk override MAKEFLAGS= diff --git a/target/sdk/files/Makefile b/target/sdk/files/Makefile index 2edf7b3a20..8df1904cb0 100644 --- a/target/sdk/files/Makefile +++ b/target/sdk/files/Makefile @@ -14,7 +14,7 @@ export TOPDIR LC_ALL LANG SDK world: -include $(TOPDIR)/include/host.mk +export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH) ifneq ($(OPENWRT_BUILD),1) override OPENWRT_BUILD=1 diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile index 2fcda3e25f..ef2dc68a97 100644 --- a/target/toolchain/Makefile +++ b/target/toolchain/Makefile @@ -9,7 +9,6 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/version.mk override MAKEFLAGS= |