summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/image.mk4
-rw-r--r--mk/package.mk6
-rw-r--r--mk/vars.mk8
3 files changed, 8 insertions, 10 deletions
diff --git a/mk/image.mk b/mk/image.mk
index fcf3af89e..2a0a03201 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -139,7 +139,7 @@ else
endif
@${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
../linux/kernel.control ${KERNEL_VERSION} ${ADK_TARGET_CPU_ARCH}
- $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
+ PATH='$(HOST_PATH)' $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
$(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE)
$(CMD_TRACE) " done"
$(END_TRACE)
@@ -156,7 +156,7 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}/.adk
$(CPIO) --quiet -o -Hustar --owner=0:0 | $(XZ) -c >$@
${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
- env PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
+ PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
${TARGET_DIR}/ >$@
( \
echo "nod /dev/console 0644 0 0 c 5 1"; \
diff --git a/mk/package.mk b/mk/package.mk
index 8b99a78a6..e6bb0fed0 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -272,13 +272,13 @@ ifeq (,$(filter noscripts,$(7)))
endif
ifeq (,$(filter devonly,$(7)))
- $${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
+ PATH='$(HOST_PATH)' $${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
ifneq ($(ADK_BUILD_WITH_DEBUG),)
- $${PKG_BUILD} $${IDIR_$(1)_DBG} $${PACKAGE_DIR} $(MAKE_TRACE)
+ PATH='$(HOST_PATH)' $${PKG_BUILD} $${IDIR_$(1)_DBG} $${PACKAGE_DIR} $(MAKE_TRACE)
endif
endif
ifneq (,$(filter dev,$(7)))
- $${PKG_BUILD} $${IDIR_$(1)_DEV} $${PACKAGE_DIR} $(MAKE_TRACE)
+ PATH='$(HOST_PATH)' $${PKG_BUILD} $${IDIR_$(1)_DEV} $${PACKAGE_DIR} $(MAKE_TRACE)
endif
clean-targets: clean-dev-$(1)
diff --git a/mk/vars.mk b/mk/vars.mk
index 912fa5e73..e252efb31 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -379,8 +379,7 @@ HOST_ENV= CC='$(HOST_CC)' \
PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))
ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
-PKG_BUILD:= PATH='${HOST_PATH}' \
- ${BASH} ${SCRIPT_DIR}/ipkg-build
+PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/ipkg-build
PKG_INSTALL:= PATH='${HOST_PATH}' \
IPKG_TMP=$(BUILD_DIR)/tmp \
IPKG_INSTROOT=$(TARGET_DIR) \
@@ -393,8 +392,7 @@ PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg
endif
ifeq ($(ADK_TARGET_PACKAGE_OPKG),y)
-PKG_BUILD:= PATH='${HOST_PATH}' \
- ${BASH} ${SCRIPT_DIR}/ipkg-build
+PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/ipkg-build
PKG_INSTALL:= PATH='${HOST_PATH}' \
IPKG_TMP=$(BUILD_DIR)/tmp \
IPKG_INSTROOT=$(TARGET_DIR) \
@@ -407,7 +405,7 @@ PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/opkg
endif
ifeq ($(ADK_TARGET_PACKAGE_TXZ),y)
-PKG_BUILD:= PATH='${HOST_PATH}' ${BASH} ${SCRIPT_DIR}/tarpkg build
+PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/tarpkg build
PKG_INSTALL:= PKG_INSTROOT='$(TARGET_DIR)' \
PATH='${HOST_PATH}' ${BASH} ${SCRIPT_DIR}/tarpkg install
PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/pkg