X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=rules.mk;h=2437e93a1c601ae0b4c5ff0d14b68b008c8f097e;hp=6fbf88f801f21113335ed2e733670d966479d447;hb=81bea3c501a85c7c9a4be1197a96d8337a45698b;hpb=4b0c035a935f151eba1b4892800f3e6a5b1b6431 diff --git a/rules.mk b/rules.mk index 6fbf88f801..2437e93a1c 100644 --- a/rules.mk +++ b/rules.mk @@ -14,6 +14,7 @@ export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' -- ARCH:=$(strip $(subst ",, $(CONFIG_ARCH))) TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION))) +BUILD_DIR_SUFFIX:=$(strip $(subst ",, $(CONFIG_BUILD_SUFFIX))) WGET:=$(strip $(subst ",, $(CONFIG_WGET))) #"))"))")) # fix vim's broken syntax highlighting @@ -30,7 +31,7 @@ STAGING_DIR:=$(TOPDIR)/staging_dir_$(ARCH) BIN_DIR:=$(TOPDIR)/bin PACKAGE_DIR:=$(BIN_DIR)/packages IPKG_TARGET_DIR:=$(PACKAGE_DIR) -BUILD_DIR:=$(TOPDIR)/build_$(ARCH) +BUILD_DIR:=$(TOPDIR)/build_$(ARCH)$(BUILD_DIR_SUFFIX) TMP_DIR:=$(TOPDIR)/tmp STAMP_DIR:=$(BUILD_DIR)/stamp TARGET_DIR:=$(BUILD_DIR)/root @@ -45,7 +46,7 @@ endif IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH) TARGET_PATH:=$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH) -TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) +TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) -fhonour-copts export PATH:=$(TARGET_PATH) @@ -137,4 +138,3 @@ endef all: FORCE: ; .PHONY: FORCE -%: ;