diff options
author | unknown <knielsen@knielsen-hq.org> | 2009-05-11 17:31:30 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2009-05-11 17:31:30 +0200 |
commit | db020fb30f56c1ec1b1e65304ad5a0830fddab34 (patch) | |
tree | 1e32ea1d53d4bb0df263c9cd72f5951f54158ac1 /BUILD/SETUP.sh | |
parent | b125770aaadd09e839ad9211047e88095984308b (diff) | |
parent | 13c45ccbd3ac417da5b5236e5e81d01d093355b7 (diff) | |
download | mariadb-git-db020fb30f56c1ec1b1e65304ad5a0830fddab34.tar.gz |
Merge Toby Thain's Solaris fixes.
Diffstat (limited to 'BUILD/SETUP.sh')
-rwxr-xr-x | BUILD/SETUP.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index b63841aef2d..7677119843c 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -80,7 +80,13 @@ path=`dirname $0` . "$path/check-cpu" export AM_MAKEFLAGS -AM_MAKEFLAGS="-j 6" +# Default to a parallel build, but only if AM_MAKEFLAGS is not set. +# (So buildbots can easily disable this behaviour if required.) +if test -z "$AM_MAKEFLAGS" +then + AM_MAKEFLAGS="-j 6" +fi + # SSL library to use.--with-ssl will select our bundled yaSSL # implementation of SSL. To use openSSl you will nee too point out |