diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-08-30 23:14:29 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-08-30 23:14:29 +0200 |
| commit | 4e16868d88425ff5075fccc348ddb09acc3e7bf7 (patch) | |
| tree | a9d5192782806d628494443abbf62ecb48be0520 /BUILD/SETUP.sh | |
| parent | a10a5cb663fbb953e317568f35041b87d2d79a60 (diff) | |
| parent | 077b649aef8c7432e8b08606465d5954d07289ed (diff) | |
| download | mariadb-git-4e16868d88425ff5075fccc348ddb09acc3e7bf7.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
BUILD/SETUP.sh:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto 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 57061f3dbff..8055f337821 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -1,6 +1,6 @@ #!/bin/sh -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 @@ -122,12 +122,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 |