Skip to content

M
mariadb
Commit 1f07fa02 authored by tsmith@maint1.mysql.com's avatar tsmith@maint1.mysql.com
Browse files
Options

Merge maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/40 

into  maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41
parents 45460bd0 54e73e93
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
BUILD/SETUP.sh
View file @ 1f07fa02
#!/bin/sh #!/bin/sh
if ! test -f sql/mysqld.cc if test ! -f sql/mysqld.cc
then then
echo "You must run this script from the MySQL top-level directory" echo "You must run this script from the MySQL top-level directory"
exit 1 exit 1
...@@ -109,12 +109,6 @@ fi ...@@ -109,12 +109,6 @@ fi
# (returns 0 if finds lines) # (returns 0 if finds lines)
if ccache -V > /dev/null 2>&1 if ccache -V > /dev/null 2>&1
then then
if ! (echo "$CC" | grep "ccache" > /dev/null) echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"
then echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"
CC="ccache $CC"
fi
if ! (echo "$CXX" | grep "ccache" > /dev/null)
then
CXX="ccache $CXX"
fi
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7