summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-10-06 17:54:43 +0300
committermonty@mysql.com <>2005-10-06 17:54:43 +0300
commit78e828d32f4c94a7135b7ddcf749ddc9e5bd0d3d (patch)
treed92cfa6fa6040c06b41cafe2869f42c993c0ab2b /BUILD
parentff4a6e139e2a0b8d382dfadeff2cdc06b19c72a7 (diff)
downloadmariadb-git-78e828d32f4c94a7135b7ddcf749ddc9e5bd0d3d.tar.gz
Review of code pushed since last 5.0 pull:
Ensure that ccache is also used for C programs mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter Fixed test cases by adding missing DROP's and rename views to be of type 'v#' Removed MY_UNIX_PATH from fn_format() Removed current_db_used from TABLE_LIST Removed usage of 'current_thd' in Item_splocal Removed some compiler warnings A bit faster longlong2str code
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/FINISH.sh2
-rwxr-xr-xBUILD/SETUP.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 8cd78bf4165..2fc8015ea28 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -14,7 +14,7 @@ path=`dirname $0`
if [ -z "$just_clean" ]
then
commands="$commands
-CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \
+CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \
$configure"
fi
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 1603cfadbed..b9d96cf10b1 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -98,6 +98,10 @@ else
make=make
fi
+if test -z "$CC" ; then
+ CC=gcc
+fi
+
if test -z "$CXX" ; then
CXX=gcc
fi