Made ccache working with uClibc toolchain.

diff --git a/lfs/ccache b/lfs/ccache
index a2217499c68b1982f9a8bf4a264fa032ba20b76c..4c032025b0b99754a496fa2af0924ae06fa8a66b 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -53,6 +53,8 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
+
+ifeq "$(STAGE)" "toolchain"
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -p0 < $(DIR_PATCHES)/$(THISAPP).patch
        cd $(DIR_APP) && CFLAGS="-O2 -static" ./configure --prefix=$(PREFIX)
@@ -63,4 +65,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -sf ccache $(PREFIX)/bin/cc
        $(PREFIX)/bin/ccache -z
        @rm -rf $(DIR_APP)
+endif
+
+ifeq "$(STAGE)" "installer"
+       ln -sf ccache $(PREFIX)/bin/$(UCLIBC_TARGET)-gcc
+       ln -sf ccache $(PREFIX)/bin/$(UCLIBC_TARGET)-g++
+       ln -sf ccache $(PREFIX)/bin/$(UCLIBC_TARGET)-cc
+endif
+
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 478a3e73b718b1f2a4ee4efc2055d65171d465d7..54982d26b369d233de28e5bd3b62c086e4104111 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -401,8 +401,9 @@ misc_build() {
 ################################################################################
 installer_build() {
 
-       PATH=${UCLIBC_DIR}/bin:${UCLIBC_DIR}/usr/bin:${UCLIBC_CC_CORE_STATIC_DIR}/bin
-       PATH=$PATH:${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
+       PATH=${TOOLS_DIR}/usr/bin:${UCLIBC_DIR}/bin:${UCLIBC_DIR}/usr/bin
+       PATH=$PATH:${UCLIBC_CC_CORE_STATIC_DIR}/bin:/bin:/usr/bin
+       PATH=$PATH:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
        STAGE_ORDER=05
        STAGE=installer
 
@@ -410,6 +411,7 @@ installer_build() {
        export LOGFILE
 
        ipfire_make stage5
+       ipfire_make ccache
        ipfire_make linux
        ipfire_make binutils
        ipfire_make uClibc              PASS=1