diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-08-30 20:04:33 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-08-30 20:04:33 +0200 |
| commit | 4321eb12fa3c5f67469d172889fe48e29b299f9b (patch) | |
| tree | 555779c39a351298acc7521c572380b927b02fb4 /BUILD | |
| parent | b2a0d025e3f3dc2a8e9ab83634f542d50c4f99a8 (diff) | |
| parent | 06707e20bc63698e6b97bc91fe7b644f65271e72 (diff) | |
| download | mariadb-git-4321eb12fa3c5f67469d172889fe48e29b299f9b.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
BUILD/SETUP.sh:
SCCS merged
Diffstat (limited to 'BUILD')
| -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 3f8a9ccaf22..285ed0ec402 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 @@ -109,12 +109,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 |