diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
| commit | 860e754349646fb8ec8e9231a7fc09a5d4b7c247 (patch) | |
| tree | d66c4b8a3c96e8e0d6e6ad9dfb12cdca750eb754 /BUILD | |
| parent | 71e1ddda220c2d452351fc6bf240cb0bad6ccf4a (diff) | |
| parent | 365cd08345ab759308cfcac663a2a5880c0c33cb (diff) | |
| download | mariadb-git-860e754349646fb8ec8e9231a7fc09a5d4b7c247.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 8 | ||||
| -rwxr-xr-x | BUILD/SETUP.sh | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index fd51f2f5dfe..015f973d8a8 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -44,7 +44,13 @@ cd ../storage/rocksdb/rocksdb git submodule update cd ../../maria/libmarias3 git submodule update -cd ../../.." +cd ../../.. +cd storage/columnstore/columnstore +git submodule update +cd ../../.. +cd wsrep-lib +git submodule update +cd .." fi commands="$commands path=`dirname $0` diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index bc4c65d5f6b..9cd022f8ad8 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -32,6 +32,7 @@ Usage: $0 [-h|-n] [configure-options] -n, --just-print Don't actually run any commands; just print them. -c, --just-configure Stop after running configure. Combined with --just-print shows configure options. + --just-clean Clean up compilation files and update sub modules --extra-configs=xxx Add this to configure options --extra-flags=xxx Add this C and CXX flags --extra-cflags=xxx Add this to C flags @@ -71,6 +72,8 @@ parse_options() just_configure=1;; -n | --just-print | --print) just_print=1;; + --just-clean) + just_clean=1;; --verbose) verbose_make=1;; -h | --help) @@ -94,6 +97,7 @@ fi prefix="/usr/local/mysql" just_print= +just_clean= just_configure= warning_mode= maintainer_mode= |