diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-30 18:16:57 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-30 18:16:57 +0200 |
| commit | 5a3b3d9afb6233ff785eab2a9679374ae274a75c (patch) | |
| tree | 875f73a5e544d5081679d47586ae25b90498fb86 /BUILD/SETUP.sh | |
| parent | 205baff9ab39cc030b950ae751118561918f3e83 (diff) | |
| parent | d904739cc1d98107f67e76a67b0ea6eb2af326ec (diff) | |
| download | mariadb-git-5a3b3d9afb6233ff785eab2a9679374ae274a75c.tar.gz | |
automerge
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 3df03dc8509..f38ecf6d8b9 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -86,15 +86,9 @@ set -e # path=`dirname $0` . "$path/check-cpu" +. "$path/util.sh" -export AM_MAKEFLAGS -# 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 - +get_make_parallel_flag # SSL library to use.--with-ssl will select our bundled yaSSL # implementation of SSL. To use openSSl you will nee too point out |