Port kmod-gre to the new module layout

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 206e57d..3645b06 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -33,15 +33,19 @@ STAMP_DIR:=$(BUILD_DIR)/stamp
 TARGET_DIR:=$(BUILD_DIR)/root
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
 
 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_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 
 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 


@@ -53,6 +57,12 @@ 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
 

+ifneq ($(CONFIG_CCACHE),)
+  # FIXME: move this variable to a better location
+  export CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH)
+  TARGET_CC:= ccache $(TARGET_CC)
+endif
+

 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
        -e 's/sparc.*/sparc/' \
        -e 's/arm.*/arm/' \
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
        -e 's/sparc.*/sparc/' \
        -e 's/arm.*/arm/' \


@@ -69,13 +79,12 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 GNU_HOST_NAME:=$(HOST_ARCH)-pc-linux-gnu
 
 TARGET_CONFIGURE_OPTS:= \
 GNU_HOST_NAME:=$(HOST_ARCH)-pc-linux-gnu
 
 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


@@ -96,7 +105,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 root -g root

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