summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-01-10 19:36:38 +0200
committerMonty <monty@mariadb.org>2018-01-10 19:36:38 +0200
commitec97aba28462aab18137f96317c4b441385df12a (patch)
tree2111cedae13afa37e992296545ee277daf7f626d /BUILD
parentdfde5ae912d402ec68fd17eda92112d84a07ffdd (diff)
downloadmariadb-git-ec97aba28462aab18137f96317c4b441385df12a.tar.gz
Fixed BUILD scripts
- Skip 'clean' if not a git repository (Good for tar files) - Add configuration for ASAN builds
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/FINISH.sh12
-rwxr-xr-xBUILD/compile-pentium64-asan-max39
2 files changed, 47 insertions, 4 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 20784c49f0b..1faf62a9b62 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"
@@ -32,15 +32,19 @@ then
configure="$configure --verbose"
fi
+commands=""
# git clean -fdX removes all ignored (build) files
-commands="\
+if test -d .git
+then
+ commands="\
git clean -fdX
cd ./libmariadb
git submodule update
cd ../storage/rocksdb/rocksdb
git submodule update
-cd ../../..
-
+cd ../../.."
+fi
+commands="$commands
path=`dirname $0`
. \"$path/autorun.sh\""
diff --git a/BUILD/compile-pentium64-asan-max b/BUILD/compile-pentium64-asan-max
new file mode 100755
index 00000000000..db595b418df
--- /dev/null
+++ b/BUILD/compile-pentium64-asan-max
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$pentium64_cflags $debug_cflags -lasan -O -g -fsanitize=address"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs"
+export LDFLAGS="-ldl"
+
+. "$path/FINISH.sh"