From 2e53b5deb53225ec8b3aa424659a4e3ae38358c5 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 12 Apr 2011 15:31:01 +0200 Subject: [PATCH] scons: fixed parse-config to honor NOPARALLEL flag --- develop/scons/parse-config | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/develop/scons/parse-config b/develop/scons/parse-config index 2cbecd0e7..e7e5f6087 100644 --- a/develop/scons/parse-config +++ b/develop/scons/parse-config @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../scons/parse-config +# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,5 +13,10 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -[ "$SDECFG_PARALLEL_MAX" ] && var_insert sconsopt " " "--jobs $SDECFG_PARALLEL_MAX" +if ! hasflag NOPARALLEL && [ "$SDECFG_PARALLEL_MAX" ] ; then + if [ $SDECFG_PARALLEL_MAX -gt 1 ]; then + # echo_status "Parallel build using $SDECFG_PARALLEL_MAX jobs enabled." + var_insert sconsopt " " "--jobs $SDECFG_PARALLEL_MAX" + fi +fi