From b855b9706c20b6890224ed50778e1e4da53b154c Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Thu, 11 Aug 2011 12:24:30 +0000
Subject: "Don't use parallel make by default," he says after accidentally
 turning it off and discovering that his builds are about 4 times faster.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4627 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 unix/build-xorg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unix/build-xorg b/unix/build-xorg
index f7abcc24..95e7134f 100755
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -8,6 +8,7 @@ set -e
 
 PREFIX=
 MAKE="make"
+PARALLEL_MAKE=0
 XORG_VERSION=7.4
 XONLY=0
 CFGHOST=
@@ -226,7 +227,7 @@ usage ()
     exit 1
 }
 
-if [ -x '/usr/bin/getconf' ]; then
+if [ -x '/usr/bin/getconf' -a "$PARALLEL_MAKE" = "1" ]; then
     MAKE_PARALLEL=`/usr/bin/getconf _NPROCESSORS_ONLN 2>&1`
     [ "$MAKE_PARALLEL" -gt 1 ] && MAKE="$MAKE -j$MAKE_PARALLEL"
 fi
@@ -240,6 +241,7 @@ do
 	rebuild)    MODE=rebuild             ;;
 	update)     MODE=update              ;;
 	-version)   XORG_VERSION=$2;  shift  ;;
+	-parallel)  PARALLEL_MAKE=1;         ;;
 	-srcdir)    SRCDIR=$2;        shift  ;;
 	*)          break                    ;;
     esac
-- 
cgit v1.2.3