b=10957

[fs/lustre-release.git] / build / lmake

diff --git a/build/lmake b/build/lmake
index 1afbb1a..fd99ce8 100755 (executable)
--- a/build/lmake
+++ b/build/lmake
@@ -261,6 +261,25 @@ load_target()
     fi
 }
 
+# do these after load_target(), which maybe export CC
+setup_ccache_distcc()
+{
+    # distcc can't handle ".incbin"
+    if [ "$TARGET" == "2.6-suse" -o "$TARGET" == "2.6-rhel4" ]; then
+        if [ "$TARGET_ARCH" == "x86_64" ]; then
+            unset DISTCC
+        fi
+    fi
+    
+    CC=${CC:-gcc}
+    if [ "$CCACHE" ]; then
+        CC="$CCACHE $CC"
+        [ "$DISTCC" ] && export CCACHE_PREFIX="$DISTCC"
+    else
+        [ "$DISTCC" ] && CC="$DISTCC $CC"
+    fi
+}
+
 tarflags()
 {
     case "$1" in
@@ -378,6 +397,9 @@ depend_kernel()
     echo "Making depend in $PWD..."
     $MAKE "$MAKE_CC" mrproper || fatal 1 "Error running make mrproper"
     rm -f rpm-release
+    # remove localversion-* files to avoid kernel release string 
+    # srewing up by the top-level Makefile
+    rm -f localversion-*
     cp "$CONFIG_FILE" .config
     local UPDATE_OLDCONFIG=
     for oc in oldconfig_nonint silentoldconfig oldconfig ; do                   
@@ -787,6 +809,7 @@ done
 
 check_options
 load_target
+setup_ccache_distcc
 
 extract_kernel
 patch_kernel