X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=3558f2f0284eb041820623b5fd1e0e02abee80c2;hb=4f02285d8b4a66359a8fa46f22a3efde391b5419;hp=5d30baba8563311b403a3a7f3c85c626ba3a07ac;hpb=d826af2cbbc7ff9781d6b9fdde5866f6e6367ec6;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/rules.mk b/rules.mk
index 5d30baba85..3558f2f028 100644
--- a/rules.mk
+++ b/rules.mk
@@ -21,6 +21,7 @@ DUMP:=1
 endif
 
 export TMP_DIR:=$(TOPDIR)/tmp
+export TMPDIR:=$(TMP_DIR)
 
 qstrip=$(strip $(subst ",,$(1)))
 #"))
@@ -29,7 +30,7 @@ empty:=
 space:= $(empty) $(empty)
 comma:=,
 merge=$(subst $(space),,$(1))
-confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
+confvar=$(shell echo '$(foreach v,$(1),$(v)=$(subst ','\'',$($(v))))' | $(STAGING_DIR_HOST)/bin/mkhash md5)
 strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
 
 paren_left = (
@@ -139,7 +140,7 @@ else
 endif
 
 ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
-  iremap = -iremap $(1):$(2)
+  iremap = -iremap$(1):$(2)
 endif
 
 PACKAGE_DIR:=$(BIN_DIR)/packages