X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=rules.mk;h=0822979012d5b985716fe5c24fd278535f388b1e;hp=c9efb9e8c9e29595845eeceb2cc95664b39aeea8;hb=bb9833a17a8a093eef7656328ea622091ba2c0c3;hpb=c541b31e4074c1cb0f73cb4a93280641e56b8811 diff --git a/rules.mk b/rules.mk index c9efb9e8c9..0822979012 100644 --- a/rules.mk +++ b/rules.mk @@ -21,6 +21,7 @@ qstrip=$(strip $(subst ",,$(1))) empty:= space:= $(empty) $(empty) +comma:=, merge=$(subst $(space),,$(1)) confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n))) strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1)) @@ -187,9 +188,9 @@ export PKG_CONFIG HOSTCC:=gcc HOSTCXX:=g++ -HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include +HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS) -HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib +HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib TARGET_CC:=$(TARGET_CROSS)gcc TARGET_AR:=$(TARGET_CROSS)ar @@ -277,8 +278,7 @@ V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) endef define shexport -$(call shvar,$(1))=$$(call $(1)) -export $(call shvar,$(1)) +export $(call shvar,$(1))=$$(call $(1)) endef define include_mk