diff options
| author | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
| commit | 17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf (patch) | |
| tree | ac2ca2aacd05cc4eb1bec0b1f8c909b9d64fa2e6 /BUILD | |
| parent | dad1e2048d3ac1477557a2645ccd323143601723 (diff) | |
| parent | f577ebb88fc4f56f440ee3736b54512d528ca0a9 (diff) | |
| download | mariadb-git-17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 2 | ||||
| -rwxr-xr-x | BUILD/SETUP.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 8cd78bf4165..2fc8015ea28 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -14,7 +14,7 @@ path=`dirname $0` if [ -z "$just_clean" ] then commands="$commands -CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \ +CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \ $configure" fi diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 598aaaa80ae..96ec5803b63 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -104,6 +104,10 @@ else make=make fi +if test -z "$CC" ; then + CC=gcc +fi + if test -z "$CXX" ; then CXX=gcc fi |