X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=rules.mk;h=a4dcaa1fcdbd42f1156be727c27d5fa585f55323;hb=031c35252f42ccf74566df2dfa92b83eebc5b698;hp=8e5294edb3ad69ccbd3b218922a0449c368b8995;hpb=34dbf787c3fa13541abc9aadcf53c23016895382;p=openwrt.git diff --git a/rules.mk b/rules.mk index 8e5294edb3..a4dcaa1fcd 100644 --- a/rules.mk +++ b/rules.mk @@ -8,7 +8,9 @@ -include $(TOPDIR)/.config include $(TOPDIR)/include/verbose.mk -export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' -- +export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' -- +export BASH=$(shell which bash) + ARCH:=$(strip $(subst ",, $(CONFIG_ARCH))) TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION))) WGET:=$(strip $(subst ",, $(CONFIG_WGET))) @@ -82,6 +84,7 @@ RSTRIP:= \ # where to build (and put) .ipk packages IPKG:= \ + PATH="$(STAGING_DIR)/bin:$(PATH)" \ IPKG_TMP=$(BUILD_DIR)/tmp \ IPKG_INSTROOT=$(TARGET_DIR) \ IPKG_CONF_DIR=$(STAGING_DIR)/etc \ @@ -103,9 +106,9 @@ ifneq ($(CONFIG_LARGEFILE),y) endif ifeq ($(CONFIG_TAR_VERBOSITY),y) - TAR_OPTIONS=-xvf + TAR_OPTIONS:=-xvf - else - TAR_OPTIONS=-xf + TAR_OPTIONS:=-xf - endif all: