diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2005-07-27 21:58:38 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2005-07-27 21:58:38 +0000 |
| commit | bc9e49c77def12f54dcea33ad367cd43b8a082e0 (patch) | |
| tree | 5c24e0a8bc486e5c1ba4003ab2acf3e5536d144d | |
| parent | 00b16889ab461b7ecef1c91ade101186b7f1fce2 (diff) | |
Fix PR608:
Previously the script assumed the version number was the last field, now
it assumes it is the first sequence of digits.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22527 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.in | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 42775d3349..b7e11e69e6 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -404,7 +404,7 @@ fi dnl Verify that GCC is version 3.0 or higher if test "$GCC" = "yes" then - gccmajor=`$CC --version | head -n 1 | awk '{print $NF;}' | cut -d. -f1` + gccmajor=`$CC --version | head -n 1 | sed 's/[[^0-9]]*\([[0-9.]]\).*/\1/'` if test "$gccmajor" -lt "3" then AC_MSG_ERROR([gcc 3.x required, but you have a lower version]) @@ -24842,7 +24842,7 @@ fi if test "$GCC" = "yes" then - gccmajor=`$CC --version | head -n 1 | awk '{print $NF;}' | cut -d. -f1` + gccmajor=`$CC --version | head -n 1 | sed 's/[^0-9]*\([0-9.]\).*/\1/'` if test "$gccmajor" -lt "3" then { { echo "$as_me:$LINENO: error: gcc 3.x required, but you have a lower version" >&5 diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index ecd6b55e51..79204ca2f7 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -449,9 +449,9 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ |