diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
| commit | a8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (patch) | |
| tree | f619f2a7ed54abbc9edd42b77f5b63caa6ec65ac /BUILD | |
| parent | 04efe13501246e490932d4be7bca90e207e0b5e2 (diff) | |
| parent | 1dc2f35598193fc52b79061c286b61f01c617374 (diff) | |
| download | mariadb-git-a8a5c8a1b8ac566241d43a85de90c11f5d1568d9.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 14347ca8232..cc66ed09f5d 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -62,11 +62,15 @@ commands="$commands path=`dirname $0` . \"$path/autorun.sh\"" -if [ -z "$just_clean" ] +if [ -z "$just_clean"] then -commands="$commands -git submodule update -CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" $configure" + if test -d .git + then + commands="$commands + git submodule update" + fi + commands="$commands + CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" $configure" fi if [ -z "$just_configure" -a -z "$just_clean" ] |