fix brcm-2.4 target profiles

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 33e8354..a593468 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -8,7 +8,7 @@
 -include $(TOPDIR)/.config
 include $(TOPDIR)/include/verbose.mk
 
 -include $(TOPDIR)/.config
 include $(TOPDIR)/include/verbose.mk
 

-export SHELL=/bin/bash
+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)))
 
 ARCH:=$(strip $(subst ",, $(CONFIG_ARCH)))
 TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION)))


@@ -22,28 +22,33 @@ OPTIMIZE_FOR_CPU:=$(ARCH)
 DL_DIR:=$(TOPDIR)/dl
 INCLUDE_DIR:=$(TOPDIR)/include
 SCRIPT_DIR:=$(TOPDIR)/scripts
 DL_DIR:=$(TOPDIR)/dl
 INCLUDE_DIR:=$(TOPDIR)/include
 SCRIPT_DIR:=$(TOPDIR)/scripts

-TOOL_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
+TOOL_BUILD_DIR:=$(TOPDIR)/tool_build
+TOOLCHAIN_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)

 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)
 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)

-TMP_DIR:=$(BUILD_DIR)/tmp
+TMP_DIR:=$(TOPDIR)/tmp

 STAMP_DIR:=$(BUILD_DIR)/stamp
 TARGET_DIR:=$(BUILD_DIR)/root
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
 
 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
-KERNEL_CROSS:=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
-TARGET_CROSS:=$(STAGING_DIR)/bin/$(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)
 
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 

-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
+TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)

 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 

+export PATH:=$(TARGET_PATH)
+

 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_DIR:=$(BUILD_DIR)/linux

-LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
+LINUX_HEADERS_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux

 
 # APPLICATIONS #
 HOSTCC:=gcc
 
 # APPLICATIONS #
 HOSTCC:=gcc


@@ -53,29 +58,23 @@ PATCH:=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR)/bin/sed -i -e
 CP:=cp -fpR
 
 SED:=$(STAGING_DIR)/bin/sed -i -e
 CP:=cp -fpR
 

-HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-       -e 's/sparc.*/sparc/' \
-       -e 's/arm.*/arm/' \
-       -e 's/m68k.*/m68k/' \
-       -e 's/ppc/powerpc/' \
-       -e 's/v850.*/v850/' \
-       -e 's/sh[234]/sh/' \
-       -e 's/mips-.*/mips/' \
-       -e 's/mipsel-.*/mipsel/' \
-       -e 's/cris.*/cris/' \
-       -e 's/i[3-9]86/i386/' \
-       )
-
-GNU_HOST_NAME:=$(HOST_ARCH)-pc-linux-gnu
+INSTALL_BIN:=install -m0755
+INSTALL_DIR:=install -d -m0755
+INSTALL_DATA:=install -m0644
+
+ifneq ($(CONFIG_CCACHE),)
+  # FIXME: move this variable to a better location
+  export CCACHE_DIR=$(STAGING_DIR)/ccache
+  TARGET_CC:= ccache $(TARGET_CC)
+endif

 
 TARGET_CONFIGURE_OPTS:= \
 
 TARGET_CONFIGURE_OPTS:= \

-  PATH=$(TARGET_PATH) \

   AR=$(TARGET_CROSS)ar \
   AR=$(TARGET_CROSS)ar \

-  AS=$(TARGET_CROSS)as \
+  AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \

   LD=$(TARGET_CROSS)ld \
   NM=$(TARGET_CROSS)nm \
   LD=$(TARGET_CROSS)ld \
   NM=$(TARGET_CROSS)nm \

-  CC=$(TARGET_CROSS)gcc \
-  GCC=$(TARGET_CROSS)gcc \
+  CC="$(TARGET_CC)" \
+  GCC="$(TARGET_CC)" \

   CXX=$(TARGET_CROSS)g++ \
   RANLIB=$(TARGET_CROSS)ranlib \
   STRIP=$(TARGET_CROSS)strip
   CXX=$(TARGET_CROSS)g++ \
   RANLIB=$(TARGET_CROSS)ranlib \
   STRIP=$(TARGET_CROSS)strip


@@ -88,6 +87,7 @@ RSTRIP:= \
 
 # where to build (and put) .ipk packages
 IPKG:= \
 
 # where to build (and put) .ipk packages
 IPKG:= \

+  PATH="$(STAGING_DIR)/bin:$(PATH)" \

   IPKG_TMP=$(BUILD_DIR)/tmp \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_CONF_DIR=$(STAGING_DIR)/etc \
   IPKG_TMP=$(BUILD_DIR)/tmp \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_CONF_DIR=$(STAGING_DIR)/etc \


@@ -96,7 +96,7 @@ IPKG:= \
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \

-  PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root
+  ipkg-build -c -o 0 -g 0

 
 ifeq ($(CONFIG_ENABLE_LOCALE),true)
   DISABLE_NLS:=
 
 ifeq ($(CONFIG_ENABLE_LOCALE),true)
   DISABLE_NLS:=


@@ -109,11 +109,22 @@ ifneq ($(CONFIG_LARGEFILE),y)
 endif
 
 ifeq ($(CONFIG_TAR_VERBOSITY),y)
 endif
 
 ifeq ($(CONFIG_TAR_VERBOSITY),y)

-  TAR_OPTIONS=-xvf
+  TAR_OPTIONS:=-xvf -

 else
 else

-  TAR_OPTIONS=-xf
+  TAR_OPTIONS:=-xf -

 endif
 
 endif
 

+define shvar
+V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+endef
+
+define shexport
+$(call shvar,$(1))=$$(call $(1))
+export $(call shvar,$(1))
+endef
+
+

 all:
 FORCE: ;
 .PHONY: FORCE
 all:
 FORCE: ;
 .PHONY: FORCE

+%: ;