diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-04-12 13:12:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-04-12 13:12:24 +0200 |
| commit | c8836f702532b0bc3dd16972e6b504a7340e90e2 (patch) | |
| tree | 47265168a68c970bb4e6d3ada13fdf9ebf0665a4 | |
| parent | 0eac828ab0199a639dd3657558fe9ed1411f43cd (diff) | |
| download | vim-git-c8836f702532b0bc3dd16972e6b504a7340e90e2.tar.gz | |
updated for version 7.4.258v7.4.258
Problem: Configure fails if $CC contains options.
Solution: Remove quotes around $CC. (Paul Barker)
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.in | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index bf40dea4d..f45505897 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4074,9 +4074,9 @@ if test -z "$CFLAGS"; then test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi if test "$GCC" = yes; then - gccversion=`"$CC" -dumpversion` + gccversion=`$CC -dumpversion` if test "x$gccversion" = "x"; then - gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'` + gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'` fi if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"' @@ -4091,7 +4091,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent clang version" >&5 $as_echo_n "checking for recent clang version... " >&6; } -CLANG_VERSION_STRING=`"$CC" --version 2>/dev/null | sed -n -e 's/^.*clang.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'` +CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed -n -e 's/^.*clang.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'` if test x"$CLANG_VERSION_STRING" != x"" ; then CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*/\1/p'` CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/p'` diff --git a/src/configure.in b/src/configure.in index 4b450ce04..a8df11913 100644 --- a/src/configure.in +++ b/src/configure.in @@ -46,10 +46,10 @@ if test -z "$CFLAGS"; then fi if test "$GCC" = yes; then dnl method that should work for nearly all versions - gccversion=`"$CC" -dumpversion` + gccversion=`$CC -dumpversion` if test "x$gccversion" = "x"; then dnl old method; fall-back for when -dumpversion doesn't work - gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` + gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` fi dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then @@ -68,7 +68,7 @@ dnl warning when that flag is passed to. Accordingly, adjust CFLAGS based on dnl the version number of the clang in use. dnl Note that this does not work to get the version of clang 3.1 or 3.2. AC_MSG_CHECKING(for recent clang version) -CLANG_VERSION_STRING=`"$CC" --version 2>/dev/null | sed -n -e 's/^.*clang.*\([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*$/\1/p'` +CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed -n -e 's/^.*clang.*\([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*$/\1/p'` if test x"$CLANG_VERSION_STRING" != x"" ; then CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*/\1/p'` CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/p'` diff --git a/src/version.c b/src/version.c index 6684dfa01..6da3fe30e 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 258, +/**/ 257, /**/ 256, |