diff options
| author | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
| commit | f47e003e1bfc56c2bf5d0f144a35517f526b538b (patch) | |
| tree | e2bfb9834c6e558381465ed2f57a9d873a9b2c90 /BUILD | |
| parent | 51a92bbb03cc58ab8688fa9d8226afe32e6156ca (diff) | |
| parent | 9daa56fd5ce3ccd33c32b5a505ac1d2b2c437460 (diff) | |
| download | mariadb-git-f47e003e1bfc56c2bf5d0f144a35517f526b538b.tar.gz | |
Merged 5.1 with maria 5.1
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/Makefile.am | 13 | ||||
| -rwxr-xr-x | BUILD/check-cpu | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-valgrind-max-no-ndb | 24 |
3 files changed, 38 insertions, 1 deletions
diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am index 82e31c4a47b..cd4b00ea731 100644 --- a/BUILD/Makefile.am +++ b/BUILD/Makefile.am @@ -20,6 +20,7 @@ EXTRA_DIST = FINISH.sh \ SETUP.sh \ autorun.sh \ + build_mccge.sh \ check-cpu \ cleanup \ compile-alpha \ @@ -27,8 +28,12 @@ EXTRA_DIST = FINISH.sh \ compile-alpha-cxx \ compile-alpha-debug \ compile-amd64-debug-max \ + compile-amd64-debug-max-no-ndb \ + compile-amd64-gcov \ + compile-amd64-gprof \ compile-amd64-max \ compile-amd64-max-sci \ + compile-amd64-valgrind-max \ compile-darwin-mwcc \ compile-dist \ compile-hpux11-parisc2-aCC \ @@ -51,8 +56,12 @@ EXTRA_DIST = FINISH.sh \ compile-pentium-mysqlfs-debug \ compile-pentium-pgcc \ compile-pentium-valgrind-max \ + compile-pentium64 \ compile-pentium64-debug \ compile-pentium64-debug-max \ + compile-pentium64-gcov \ + compile-pentium64-gprof \ + compile-pentium64-max \ compile-pentium64-max-sci \ compile-pentium64-valgrind-max \ compile-ppc \ @@ -60,6 +69,10 @@ EXTRA_DIST = FINISH.sh \ compile-ppc-debug-max \ compile-ppc-debug-max-no-ndb \ compile-ppc-max \ + compile-solaris-amd64 \ + compile-solaris-amd64-debug \ + compile-solaris-amd64-forte \ + compile-solaris-amd64-forte-debug \ compile-solaris-sparc \ compile-solaris-sparc-debug \ compile-solaris-sparc-forte \ diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 45dd8404f0d..33bf857b845 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -176,7 +176,7 @@ check_cpu () { fi cc_ver=`$cc --version | sed 1q` - cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'` + cc_verno=`echo $cc_ver | sed -e 's/^.*(GCC)//g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'` set -- `echo $cc_verno | tr '.' ' '` cc_major=$1 cc_minor=$2 diff --git a/BUILD/compile-pentium-valgrind-max-no-ndb b/BUILD/compile-pentium-valgrind-max-no-ndb new file mode 100755 index 00000000000..66f6ae08a7f --- /dev/null +++ b/BUILD/compile-pentium-valgrind-max-no-ndb @@ -0,0 +1,24 @@ +#! /bin/sh + +path=`dirname $0` +. "$path/SETUP.sh" + +extra_flags="$pentium_cflags $debug_cflags $valgrind_flags" +extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs" + +. "$path/FINISH.sh" + +if test -z "$just_print" +then + set +v +x + echo "\ +****************************************************************************** +Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with +--enable-assembler. When Valgrind detects an error involving an assembly +function (for example an uninitialized value used as an argument of an +assembly function), Valgrind will not print the stacktrace and 'valgrind +--gdb-attach=yes' will not work either. If you need a stacktrace in those +cases, you have to run BUILD/compile-pentium-valgrind-max with the +--disable-assembler argument. +******************************************************************************" +fi |