diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:24:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:24:51 +0200 |
| commit | b7914f562da0d4bce7c1c26b119e7063594be974 (patch) | |
| tree | df85f229a896cf3e6b24ebc34063b078774b3834 /BUILD | |
| parent | 21ef68d52e13ec146dab6cf54e0d3eca87306d58 (diff) | |
| parent | d7a4ce3c804334914b2431e91d6328945dce6b02 (diff) | |
| download | mariadb-git-b7914f562da0d4bce7c1c26b119e7063594be974.tar.gz | |
Merge 10.8 into 10.9
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" ] |