X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=rules.mk;h=b9859dbd3f66e9b653e56331a9ed05319d8fc341;hb=54cf5c5fc5064eddeacf9480a58eb2b35c1a4642;hp=6c770c48a793cd9499d19d021ce3c676ef058665;hpb=ef998d64e381ed0a92fc73edf4206f7be7335caf;p=openwrt-10.03%2F.git diff --git a/rules.mk b/rules.mk index 6c770c48a..b9859dbd3 100644 --- a/rules.mk +++ b/rules.mk @@ -8,7 +8,8 @@ -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"' -- +export BASH=$(shell which bash) ARCH:=$(strip $(subst ",, $(CONFIG_ARCH))) TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION))) @@ -22,7 +23,8 @@ OPTIMIZE_FOR_CPU:=$(ARCH) 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 @@ -33,10 +35,12 @@ 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:=$(OPTIMIZE_FOR_CPU)-linux-uclibc- -TARGET_CROSS:=$(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) TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH) @@ -45,7 +49,7 @@ TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) export PATH:=$(TARGET_PATH) LINUX_DIR:=$(BUILD_DIR)/linux -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux # APPLICATIONS # HOSTCC:=gcc @@ -57,25 +61,10 @@ CP:=cp -fpR ifneq ($(CONFIG_CCACHE),) # FIXME: move this variable to a better location - export CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH) + export CCACHE_DIR=$(STAGING_DIR)/ccache TARGET_CC:= ccache $(TARGET_CC) endif -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 - TARGET_CONFIGURE_OPTS:= \ AR=$(TARGET_CROSS)ar \ AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \ @@ -103,7 +92,7 @@ IPKG:= \ # invoke ipkg-build with some default options IPKG_BUILD:= \ - ipkg-build -c -o root -g root + ipkg-build -c -o 0 -g 0 ifeq ($(CONFIG_ENABLE_LOCALE),true) DISABLE_NLS:=