diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-08-30 23:20:01 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-08-30 23:20:01 +0200 |
| commit | 6d48c8c703e9da09fd75c6d553414b5491495960 (patch) | |
| tree | 4f9a8a7d0c359aa04ca65e58ad408080a4f98bb9 /BUILD/SETUP.sh | |
| parent | 970ebdced825dc5bb313f4f4769f5efa35af3dcf (diff) | |
| parent | 4e16868d88425ff5075fccc348ddb09acc3e7bf7 (diff) | |
| download | mariadb-git-6d48c8c703e9da09fd75c6d553414b5491495960.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
BUILD/SETUP.sh:
SCCS merged
BUILD/check-cpu:
Manual merge.
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 02d160158b3..bca7e7b2e1f 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -51,7 +51,7 @@ parse_options() ######################################################################## -if ! test -f sql/mysqld.cc +if test ! -f sql/mysqld.cc then echo "You must run this script from the MySQL top-level directory" exit 1 @@ -185,12 +185,6 @@ fi # (returns 0 if finds lines) if ccache -V > /dev/null 2>&1 then - if ! (echo "$CC" | grep "ccache" > /dev/null) - then - CC="ccache $CC" - fi - if ! (echo "$CXX" | grep "ccache" > /dev/null) - then - CXX="ccache $CXX" - fi + echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC" + echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX" fi |