X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dc14c8ff2a6961709dbac35543666aa09035e3e1..c5a9834bb42c45e2bd0873fa409cb8e7ea7badf2:/rules.mk

diff --git a/rules.mk b/rules.mk
index 8e31a27b6..965265d14 100644
--- a/rules.mk
+++ b/rules.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 ifneq ($(__rules_inc),1)
 __rules_inc=1
@@ -19,9 +18,7 @@ TMP_DIR:=$(TOPDIR)/tmp
 
 export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
 
-define qstrip
-$(strip $(subst ",,$(1)))
-endef
+qstrip=$(strip $(subst ",,$(1)))
 #"))
 
 empty:=
@@ -31,7 +28,8 @@ confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
 strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
 
 _SINGLE=export MAKEFLAGS=$(space);
-ARCH:=$(call qstrip,$(shell echo $(CONFIG_ARCH) | sed -e 's/i[3-9]86/i386/'))
+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))
 TARGET_SUFFIX=$(call qstrip,$(CONFIG_TARGET_SUFFIX))
@@ -41,7 +39,7 @@ LIBC:=$(call qstrip,$(CONFIG_LIBC))
 LIBCV:=$(call qstrip,$(CONFIG_LIBC_VERSION))
 SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
 
-OPTIMIZE_FOR_CPU=$(shell echo $(ARCH) | sed -e 's/i386/i486/')
+OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH))
 
 ifeq ($(ARCH),powerpc)
   FPIC:=-fPIC
@@ -63,15 +61,18 @@ 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)
+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
 LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-lgcc_s,$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a))
 
+ifndef DUMP
 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
   -include $(TOOLCHAIN_DIR)/info.mk
   REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))
@@ -79,12 +80,13 @@ ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
   TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-)
   TARGET_CFLAGS+= -fhonour-copts
 endif
+endif
 
 ifeq ($(CONFIG_SOFT_FLOAT),y)
-SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
-TARGET_CFLAGS+=-msoft-float
+  SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
+  TARGET_CFLAGS+= -msoft-float
 else
-SOFT_FLOAT_CONFIG_OPTION:=
+  SOFT_FLOAT_CONFIG_OPTION:=
 endif
 
 export PATH:=$(TARGET_PATH)
@@ -95,8 +97,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