diff options
| author | unknown <guilhem@mysql.com> | 2003-05-23 18:23:50 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-05-23 18:23:50 +0200 |
| commit | 51dacba909e5dde3a2d315a56f6f4500fc49c85c (patch) | |
| tree | 1935fc2566e5e66e573bbfc4d06fc0b59d1faad3 | |
| parent | 769934247dc570e7be71f2f7b9ad345d005093ac (diff) | |
| parent | 3ccee65503bc32457b7cdad4216fa964282533e5 (diff) | |
| download | mariadb-git-51dacba909e5dde3a2d315a56f6f4500fc49c85c.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
configure.in:
Auto merged
| -rw-r--r-- | BUILD/SETUP.sh | 18 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 18 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 55b82e38d63..150f9e28b41 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -71,6 +71,22 @@ else make=make fi -if test -z $CXX ; then +if test -z "$CXX" ; then CXX=gcc fi + +# If ccache (a compiler cache which reduces build time) +# (http://samba.org/ccache) is installed, use it. +# We use 'grep' and hope 'grep' will work as expected +# (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 +fi diff --git a/configure.in b/configure.in index 8a5ab75a494..9b6a174b0fb 100644 --- a/configure.in +++ b/configure.in @@ -361,7 +361,7 @@ then # we will gets some problems when linking static programs. # The following code is used to fix this problem. - if test "$CXX" = "gcc" + if test "$CXX" = "gcc" -o "$CXX" = "ccache gcc" then if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1 then |