diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 19:12:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 19:12:06 +0000 |
| commit | f545604f3e811b481d69bc9d3700cf3c1df849e9 (patch) | |
| tree | 9b3b86655a8651de8db2bea3160c6fde4807f053 /rules.mk | |
| parent | b31d6f5d303f91b9f04adb323ba785186a1ab43e (diff) | |
| download | master-187ad058-f545604f3e811b481d69bc9d3700cf3c1df849e9.tar.gz master-187ad058-f545604f3e811b481d69bc9d3700cf3c1df849e9.tar.bz2 master-187ad058-f545604f3e811b481d69bc9d3700cf3c1df849e9.zip | |
build: move host build directories of package/* to build_dir/target-*/host/
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48400 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'rules.mk')
| -rw-r--r-- | rules.mk | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -61,6 +61,8 @@ BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX)) SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) export SHELL:=/usr/bin/env bash +IS_PACKAGE_BUILD := $(if $(filter package/%,$(SUBDIR)),1) + OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH)) ifeq ($(ARCH),powerpc) @@ -94,8 +96,6 @@ BIN_DIR:=$(if $(call qstrip,$(CONFIG_BINARY_FOLDER)),$(call qstrip,$(CONFIG_BINA INCLUDE_DIR:=$(TOPDIR)/include SCRIPT_DIR:=$(TOPDIR)/scripts BUILD_DIR_BASE:=$(TOPDIR)/build_dir -BUILD_DIR_HOST:=$(BUILD_DIR_BASE)/host -STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION)) LIBC:=$(call qstrip,$(CONFIG_LIBC)) @@ -130,6 +130,9 @@ STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD) BUILD_LOG_DIR:=$(TOPDIR)/logs PKG_INFO_DIR := $(STAGING_DIR)/pkginfo +BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR)/host,$(BUILD_DIR_BASE)/host) +STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host + TARGET_PATH:=$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH))))) TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) $(EXTRA_OPTIMIZATION) TARGET_CXXFLAGS = $(TARGET_CFLAGS) |