X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=rules.mk;h=768b4805595624487068621601ea7f56886c70a6;hb=f4e092f9df4fde40d424747f4c509f67cb50a03f;hp=a8d3647b6dd480e17b259870417637cded526bdc;hpb=a1b10a937911205c5239bc98a057c0a88523b66a;p=openwrt-10.03%2F.git diff --git a/rules.mk b/rules.mk index a8d3647b6..768b48055 100644 --- a/rules.mk +++ b/rules.mk @@ -33,9 +33,12 @@ STAMP_DIR:=$(BUILD_DIR)/stamp TARGET_DIR:=$(BUILD_DIR)/root IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg -REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc -GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux -TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc- +ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) + REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc + GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux + TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc- +endif + IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH) TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH) @@ -73,7 +76,7 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ -e 's/i[3-9]86/i386/' \ ) -GNU_HOST_NAME:=$(HOST_ARCH)-pc-linux-gnu +GNU_HOST_NAME:=$(shell $(HOSTCC) -dumpmachine) TARGET_CONFIGURE_OPTS:= \ AR=$(TARGET_CROSS)ar \