X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=1bd8667fda44eb828e8dfd3926d7054d226fcc4b;hb=613727d85b9e29eb3405a6b71d257185884c6c0e;hp=5816abbbc4a2c26c3afb2fb2b15cc7e925bc7e93;hpb=4c8ee8bd4c8738c8aa3e8bfbbb9857c360f65cf2;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/rules.mk b/rules.mk index 5816abbbc4..1bd8667fda 100644 --- a/rules.mk +++ b/rules.mk @@ -63,7 +63,8 @@ TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIB PACKAGE_DIR:=$(BIN_DIR)/packages/target-$(ARCH)_$(LIBC)-$(LIBCV) STAMP_DIR:=$(BUILD_DIR)/stamp STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp -TARGET_DIR:=$(BUILD_DIR)/root-$(BOARD) +TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR)) +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) @@ -95,8 +96,6 @@ PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config export PKG_CONFIG -LINUX_HEADERS_DIR:=$(BUILD_DIR_TOOLCHAIN)/linux - HOSTCC:=gcc HOST_CFLAGS:=-O2 -I$(STAGING_DIR_HOST)/include HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib