diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
| commit | fdf43b5c78c4aeb26efdbef3172746e007ab6f1d (patch) | |
| tree | 7497fd0a024da01b2ade9c45e484a9d004a3f13b /BUILD | |
| parent | 382e85fe70cfffb6c7190c627647c19aed3912a5 (diff) | |
| parent | 8f30973234de520d95dfccca8409e5802b845331 (diff) | |
| download | mariadb-git-fdf43b5c78c4aeb26efdbef3172746e007ab6f1d.tar.gz | |
Merge 10.3 into 10.4
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 037b5ae5754..87077676c31 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -48,11 +48,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" ] |