diff options
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/check-cpu | 6 | ||||
| -rwxr-xr-x | BUILD/compile-ndb-autotest | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index abd2884bd3f..d85adf21d71 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -93,6 +93,10 @@ check_cpu () { *Opteron*) cpu_arg="opteron"; ;; + # MacOSX / Intel + *i386*i486*) + cpu_arg="pentium-m"; + ;; # Intel ia64 *Itanium*) @@ -131,7 +135,7 @@ check_cpu () { fi cc_ver=`$cc --version | sed 1q` - cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g; s/^ *//g; s/ .*//g'` + cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'` case "$cc_ver--$cc_verno" in *GCC*) diff --git a/BUILD/compile-ndb-autotest b/BUILD/compile-ndb-autotest index 3ef0091c155..be28cc28346 100755 --- a/BUILD/compile-ndb-autotest +++ b/BUILD/compile-ndb-autotest @@ -3,7 +3,17 @@ path=`dirname $0` . "$path/SETUP.sh" -extra_flags="$fast_cflags $max_cflags -g" -extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags="-DERROR_INSERT"" +extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags='-DERROR_INSERT'" +if [ "$full_debug" ] +then + extra_flags="$debug_cflags" + c_warnings="$c_warnings $debug_extra_warnings" + cxx_warnings="$cxx_warnings $debug_extra_warnings" + extra_configs="$debug_configs $extra_configs" +else + extra_flags="$fast_cflags" +fi + +extra_flags="$extra_flags $max_cflags -g" . "$path/FINISH.sh" |