Cluster/toolchain fixes.

diff --git a/lfs/Config b/lfs/Config
index 6996932843ca5ad7820bfed7c33792ffacf13606..065fe8126c10fffaec866ba8c9df63a326f001aa 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -183,6 +183,7 @@ endef
 #
 ifneq "$(STAGE)" "toolchain"
 define PREBUILD
+       set > $(DIR_TMP)/set
        echo "### STARTING INSTALL #################################################"
        echo "# Application: $(THISAPP)"
        echo "# Description: $(SHORT_DESC)"

diff --git a/lfs/icecc b/lfs/icecc
index cfdc646d746210f2030f04425edc8304fc9305d6..afbaf639535de1a28ee5b4dbb8053945a9b79fef 100644 (file)
--- a/lfs/icecc
+++ b/lfs/icecc
@@ -39,8 +39,8 @@ GROUP      = Development/Compilers
 CORE       = no
 EXTRA      = no
 DEBUG      = no
-BUILD_DEPS =
-DEPS       = # e2fsprogs (but is statically linked)
+BUILD_DEPS = e2fsprogs
+DEPS       =
 
 URL        = http://git.ipfire.org/?p=thirdparty/icecream.git;a=summary
 LICENSE    = GPLv2+

diff --git a/make.sh b/make.sh
index 15514ad56508697c98fe9f243a2924387f3de552..a9642e1ff81397c9f8bebb14538f4597a34f68df 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -51,10 +51,9 @@ toolchain_build() {
        SAVE_SKIP_PACKAGE_LIST=$SKIP_PACKAGE_LIST
        SKIP_PACKAGE_LIST=
 
+       icecc_disable
+
        toolchain_make stage1
-       toolchain_make icecc
-       iceccd_start                    # Start iceccd
-       icecc_use host                  # Use the host's tools
        toolchain_make ccache
        toolchain_make binutils         PASS=1
        toolchain_make gcc              PASS=1
@@ -66,7 +65,6 @@ toolchain_build() {
        toolchain_make gcc              PASS=2
        toolchain_make binutils         PASS=2
        toolchain_make test-toolchain   PASS=2
-       icecc_use toolchain             # Use the fresh gcc
        toolchain_make ncurses
        toolchain_make attr
        toolchain_make acl
@@ -76,6 +74,9 @@ toolchain_build() {
        toolchain_make cpio
        toolchain_make diffutils
        toolchain_make e2fsprogs
+       toolchain_make icecc
+       icecc_enable
+       icecc_use toolchain             # Use the fresh gcc
        toolchain_make file
        toolchain_make findutils
        toolchain_make gawk

diff --git a/tools/make-cluster b/tools/make-cluster
index 56dab1efde4c9e57bfac59dd247b23d6e158eb0f..3a87e9548b548ca29b1ef6e59caf53796d9842ed 100644 (file)
--- a/tools/make-cluster
+++ b/tools/make-cluster
@@ -44,6 +44,7 @@ function icecc_toolchain() {
        done
 
        if [ -e "${file}" ]; then
+               ICECC_VERSION=${file}
                return
        fi
        
@@ -62,7 +63,8 @@ function iceccd_start() {
        if [ -n "$(pidof iceccd)" ]; then
                return
        fi
-       ${TOOLS_DIR}/usr/sbin/iceccd -vvv -d -s ${ICECC_SCHEDULER} -m ${ICECC_JOBS-5}
+       ${TOOLS_DIR}/usr/sbin/iceccd -vvv -d -s ${ICECC_SCHEDULER} -m ${ICECC_JOBS-5} \
+               -N ${HOSTNAME}
 }
 
 function iceccd_stop() {
@@ -71,11 +73,15 @@ function iceccd_stop() {
 
 function icecc_disable() {
        ICECC=off
+       SAVE_CCACHE_PREFIX=${CCACHE_PREFIX}
+       unset CCACHE_PREFIX
 }
 
 function icecc_enable() {
        unset ICECC
        iceccd_start
+       CCACHE_PREFIX=$SAVE_CCACHE_PREFIX
+       unset SAVE_CCACHE_PREFIX
 }
 
 function icecc_use() {