X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=dad7456a6b88bd49d4fd44813586f38563914819;hb=2662be0557cb71f7246c71183d31f9a956a62a1a;hp=315e998b94b91a6c42e3c6ab5f4602b52950d440;hpb=c767c636e64754cc83357759538e02d5ad6d70d4;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/rules.mk b/rules.mk index 315e998b94..dad7456a6b 100644 --- a/rules.mk +++ b/rules.mk @@ -29,6 +29,7 @@ confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n))) strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1)) _SINGLE=export MAKEFLAGS=$(space); +CFLAGS:= ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH))))) BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD)) TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION)) @@ -65,7 +66,8 @@ TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD) DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD) -TARGET_PATH:=$(TOOLCHAIN_DIR)/usr/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/host/bin:$(PATH) +TARGET_PATH:=$(TOOLCHAIN_DIR)/usr/bin:$(STAGING_DIR_HOST)/bin:$(PATH) +TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH) TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include TARGET_LDFLAGS:=-L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib