diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-01-07 13:02:18 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-01-07 13:02:18 +0100 |
| commit | 951e92b2640793e4bfe4d02b8220266945326c0d (patch) | |
| tree | c9a9bbb34afd97126a362fa93bb8ed01b07bb9fa /BUILD/SETUP.sh | |
| parent | b96f268acc3a693b673fceccc62311e169496731 (diff) | |
| download | mariadb-git-951e92b2640793e4bfe4d02b8220266945326c0d.tar.gz | |
Add BUILD/compile-bintar, which builds MariaDB with correct options for a binary tarball release.
BUILD/Makefile.am:
Add BUILD/compile-bintar to source tarball.
BUILD/SETUP.sh:
Move common code to separate file to enable sharing.
BUILD/compile-bintar:
Add script to build with correct flags and ./configure options for bintar package.
BUILD/util.sh:
Move common code to separate file to enable sharing.
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 51a7d263131..2b3630217d4 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 |