From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 Oct 2008 22:13:38 +0000 (+0200)
Subject: Added new variable DISTCC_JOBS.
X-Git-Tag: v3.0-alpha1~506
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3e4d196c74f932a5e5fd4c5df103cb71487facb;p=ipfire-3.x.git

Added new variable DISTCC_JOBS.
---

diff --git a/.config-default b/.config-default
index fed3864af..fdd4f5c9c 100644
--- a/.config-default
+++ b/.config-default
@@ -140,6 +140,7 @@
 ###############################################################################
 
 #DISTCC_PORT=3632
+#DISTCC_JOBS=4
 #DISTCC_HOSTS="localhost"
 
 ###############################################################################
diff --git a/tools/make-compilers b/tools/make-compilers
index ecb00c96b..5cbbb5d7e 100755
--- a/tools/make-compilers
+++ b/tools/make-compilers
@@ -57,7 +57,7 @@ distccd_start() {
 		return
 	fi
 
-	TOOLS_DIR=$TOOLS_DIR DISTCC_PORT=$DISTCC_PORT \
+	TOOLS_DIR=$TOOLS_DIR DISTCC_PORT=$DISTCC_PORT DISTCC_JOBS=$DISTCC_JOBS \
 		LOGFILE=$BASEDIR/log_${MACHINE}/_build.00-distccd.log \
 		$BASEDIR/tools/make-compilers &
 	if [ "$?" -eq "0" ]; then
@@ -89,7 +89,7 @@ if [ "$(basename $0)" == "make-compilers" ]; then
 	# Run distccd
 	DISTCCD_PATH=$TOOLS_DIR/bin:$(echo $TOOLS_DIR/libexec/gcc/*-pc-linux-gnu/*/) \
 		$TOOLS_DIR/usr/bin/distccd --daemon --allow 0.0.0.0/0 \
-		--user nobody --nice 10 --jobs 8 --port $DISTCC_PORT \
+		--user nobody --nice 10 --jobs $DISTCC_JOBS --port $DISTCC_PORT \
 		--log-file $LOGFILE --stats --job-lifetime 600 \
 		--stats-port $(( $DISTCC_PORT + 1 )) &>/dev/null
 
diff --git a/tools/make-constants b/tools/make-constants
index 8fb6d3ae3..b841e575c 100644
--- a/tools/make-constants
+++ b/tools/make-constants
@@ -60,6 +60,7 @@ PARALLELISMFLAGS=-j$(( $(grep processor < /proc/cpuinfo | wc -l) * 2 + 1 ))
 # Default distcc options
 DISTCC_HOSTS=localhost
 DISTCC_PORT=3632
+DISTCC_JOBS=4
 
 # Default hostname
 HOSTNAME=${HOSTNAME-$(hostname -f || hostname)}