diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-02-03 13:09:35 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-02-03 13:09:35 +0100 |
| commit | eb57640e41e6e9cafc3608fa975ce693b80c47b9 (patch) | |
| tree | 802c52da6d9993522dc910d83c5ba37369f3aabc /BUILD | |
| parent | b040b460ed5fb368d1e97c9340c18274cf3d31f2 (diff) | |
| download | mariadb-git-eb57640e41e6e9cafc3608fa975ce693b80c47b9.tar.gz | |
Fixed bug in check-cpu script for SPARC and Solaris
Changed defaults on Solaris and Forte to be CC and cc instead of cc-5.0
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/build_mccge.sh | 4 | ||||
| -rwxr-xr-x | BUILD/check-cpu | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/BUILD/build_mccge.sh b/BUILD/build_mccge.sh index e1f58a055c9..f7c56cfa22b 100755 --- a/BUILD/build_mccge.sh +++ b/BUILD/build_mccge.sh @@ -1202,10 +1202,10 @@ set_cc_and_cxx_for_icc() set_cc_and_cxx_for_forte() { if test "x$CC" = "x" ; then - CC="cc-5.0" + CC="cc" fi if test "x$CXX" = "x" ; then - CXX="cc-5.0" + CXX="CC" fi } diff --git a/BUILD/check-cpu b/BUILD/check-cpu index eac271932d6..27e0acf69a0 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -54,8 +54,8 @@ check_cpu () { model_name=`machine` ;; *) - cpu_family=`uname -m`; - model_name=`uname -p`; + cpu_family=`uname -p`; + model_name=`uname -m`; ;; esac fi @@ -144,7 +144,7 @@ check_cpu () { cpu_arg="itanium" ;; # Solaris Sparc - *sparc*sun4u*) + *sparc*sun4[uv]*) cpu_arg="sparc" ;; # Power PC |