X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=rules.mk;h=89adb3efc26dbcfc020544569f7c9f5bb51968e6;hp=206e57dd03e1f6cd2a461ccf1194307166328481;hb=4c102c1828e19f29666c0818a98c99171565c5b8;hpb=96a116341a30bce09a7d4a45e37a02e07412f543

diff --git a/rules.mk b/rules.mk
index 206e57dd0..89adb3efc 100644
--- a/rules.mk
+++ b/rules.mk
@@ -35,8 +35,8 @@ 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-
+KERNEL_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
+TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 
 TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
@@ -53,6 +53,11 @@ PATCH:=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR)/bin/sed -i -e
 CP:=cp -fpR
 
+ifneq ($(CONFIG_CCACHE),)
+  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/' \
@@ -74,8 +79,8 @@ TARGET_CONFIGURE_OPTS:= \
   AS=$(TARGET_CROSS)as \
   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
@@ -84,6 +89,7 @@ TARGET_CONFIGURE_OPTS:= \
 RSTRIP:= \
   STRIP="$(STRIP)" \
   STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
+  PATH=$(TARGET_PATH) \
   $(SCRIPT_DIR)/rstrip.sh
 
 # where to build (and put) .ipk packages