From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Jun 2008 17:17:12 +0000 (+0200)
Subject: Made ccache working with uClibc toolchain.
X-Git-Tag: v3.0-alpha1~984^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=390926ef93ced14d10499b098011d09240ebee42;p=ipfire-3.x.git

Made ccache working with uClibc toolchain.
---

diff --git a/lfs/ccache b/lfs/ccache
index a2217499c..4c032025b 100644
--- 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 478a3e73b..54982d26b 100755
--- 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