diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-13 18:18:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-13 18:18:28 +0200 |
| commit | bec27127753e9ee8cf58132b531dba1af534d91a (patch) | |
| tree | feb3dca3161070f71cb48aef9112f83771ee511d /BUILD | |
| parent | 0a63b50c7a2dcab6fe99885cfcbd4a35d322c63a (diff) | |
| parent | fc65577873967ecbba93b75260cc54275f5900d2 (diff) | |
| download | mariadb-git-bec27127753e9ee8cf58132b531dba1af534d91a.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 2 | ||||
| -rwxr-xr-x | BUILD/check-cpu | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index bb88c147ff9..447eae0a65f 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -14,7 +14,7 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, # MA 02110-1301, USA -set -x -v + cflags="$c_warnings $extra_flags $EXTRA_FLAGS $EXTRA_CFLAGS" cxxflags="$cxx_warnings $base_cxxflags $extra_flags $EXTRA_FLAGS $EXTRA_CXXFLAGS" extra_configs="$extra_configs $local_infile_configs $EXTRA_CONFIGS" diff --git a/BUILD/check-cpu b/BUILD/check-cpu index ad8816dc421..c1c85cfd908 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -40,6 +40,12 @@ check_compiler_cpu_flags () { cc_major=$1 cc_minor=$2 cc_patch=$3 + if test -z "$cc_minor"; then + cc_minor="0"; + fi + if test -z "$cc_patch"; then + cc_minor="0"; + fi cc_comp=`expr $cc_major '*' 100 '+' $cc_minor` fi |