diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-25 10:13:17 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-25 14:49:56 -0300 |
| commit | 74d8fbe9ef97085de9dcbfe350434cf0ec02b33f (patch) | |
| tree | d568a008f894f9676e7ce934cd1c11b54a4a6024 /tools/builder_defaults.sh | |
| parent | 64f272035c464b6c9440dbb76e97e638cd63a552 (diff) | |
| download | pfsense-74d8fbe9ef97085de9dcbfe350434cf0ec02b33f.zip pfsense-74d8fbe9ef97085de9dcbfe350434cf0ec02b33f.tar.gz | |
Make sure we do not add empty -j to make parameter
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index dbcd180..725efc3 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -185,15 +185,17 @@ export EXTRA_TOOLS=${EXTRA_TOOLS:-"uuencode uudecode ex"} export KERNEL_BUILD_PATH=${KERNEL_BUILD_PATH:-"${SCRATCHDIR}/kernels"} # Controls how many concurrent make processes are run for each stage -if [ "${NO_MAKEJ}" = "" ]; then - CPUS=`sysctl -n kern.smp.cpus` - CPUS=`expr $CPUS '*' 2` - export MAKEJ_WORLD=${MAKEJ_WORLD:-"-j$CPUS"} - export MAKEJ_KERNEL=${MAKEJ_KERNEL:-"-j$CPUS"} -else - export MAKEJ_WORLD=${MAKEJ_WORLD:-""} - export MAKEJ_KERNEL=${MAKEJ_KERNEL:-""} +local _CPUS="" +if [ -z "${NO_MAKEJ}" ]; then + _CPUS=$(expr $(sysctl -n kern.smp.cpus) '*' 2) + if [ -n "${_CPUS}" ]; then + _CPUS="-j${_CPUS}" + fi fi + +export MAKEJ_WORLD=${MAKEJ_WORLD:-"${_CPUS}"} +export MAKEJ_KERNEL=${MAKEJ_KERNEL:-"${_CPUS}"} + if [ "${TARGET}" = "i386" ]; then export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp hwpmc"} else |
