summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-01-13 16:38:43 +0200
committerMonty <monty@mariadb.org>2018-01-13 16:38:43 +0200
commit09ef28abd7c3c80a80512bb4bba7f8e8f0194abe (patch)
treee1a53dd18c29c75ebfa1f5f440443b4a627fc817 /BUILD
parent1eea7966f3e8194224ee56a4e1b322608db5efc3 (diff)
downloadmariadb-git-09ef28abd7c3c80a80512bb4bba7f8e8f0194abe.tar.gz
Fixed BUILD scripts
- Removed extra set -x -v used for debugging - Fixed that that gcc version tests works for gcc 7
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/FINISH.sh2
-rwxr-xr-xBUILD/check-cpu6
2 files changed, 7 insertions, 1 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 1faf62a9b62..ea64183253d 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