X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=rules.mk;h=ed796a54024adc4d4cbcb13d46a03bf6e0c1c8f5;hp=83d71671c42ba9f5f092cf184997832c5044a80a;hb=09bfca653c0ce9db3588c4046c53b28ae67eddbe;hpb=f55c29e4c74353ef0795eb83911c708c6db90466 diff --git a/rules.mk b/rules.mk index 83d71671c4..ed796a5402 100644 --- a/rules.mk +++ b/rules.mk @@ -29,7 +29,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 = ( @@ -101,7 +101,7 @@ ifdef CONFIG_MIPS64_ABI endif endif -DEFAULT_SUBDIR_TARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure check check-depends +DEFAULT_SUBDIR_TARGETS:=clean download prepare compile update refresh prereq dist distcheck configure check check-depends define DefaultTargets $(foreach t,$(DEFAULT_SUBDIR_TARGETS) $(1), @@ -139,7 +139,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