summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2010-04-18 15:32:05 +0200
committerJoerg Bruehe <joerg@mysql.com>2010-04-18 15:32:05 +0200
commit8dcbf6e20c9528f4e0eedd5e1be1d481215fe3db (patch)
treec875ec9df2c1c5133605fe134c52fdb4dc1c30b9 /BUILD
parent24b9ff294cf00ffc5ae78b3b45f3d74bd34faa6f (diff)
parent29f098f2d3b8cabe352bd255567c4eae4bcfea00 (diff)
downloadmariadb-git-8dcbf6e20c9528f4e0eedd5e1be1d481215fe3db.tar.gz
Merge the changes of the 5.5.3-m3 release build
back into the development branches.
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/choose_configure.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/BUILD/choose_configure.sh b/BUILD/choose_configure.sh
index 80423205274..e76e09d10b0 100644
--- a/BUILD/choose_configure.sh
+++ b/BUILD/choose_configure.sh
@@ -2,6 +2,11 @@
# Choose whether to use autoconf created configure
# of perl script that calls cmake.
+# # This is a temporary hack to build 5.5.3-m3:
+# # The "cmake" way still shows issues in our release build environment.
+# # Block it temporarily, but in a way that can easily be undone.
+# HAVE_CMAKE=no
+
# Ensure cmake and perl are there
cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
perl --version >/dev/null 2>&1 || HAVE_CMAKE=no