diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 14:39:18 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 14:39:18 +0200 |
commit | 1dc2f35598193fc52b79061c286b61f01c617374 (patch) | |
tree | 30e3972564ec174de0432e429f5f0897bf0b41a7 /BUILD/FINISH.sh | |
parent | da5d3499353036d39c3a4bcd1f0466f7de3fc263 (diff) | |
parent | fdf43b5c78c4aeb26efdbef3172746e007ab6f1d (diff) | |
download | mariadb-git-1dc2f35598193fc52b79061c286b61f01c617374.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'BUILD/FINISH.sh')
-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 05b2a5fcd3b..9287dfb0350 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -56,11 +56,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" ] |