From 0958e0fbe7307f0b46b8f692cbd097fbf93c90f6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 4 Nov 2013 04:57:50 +0100
Subject: [PATCH] updated for version 7.4.068 Problem: Cannot build Vim on
Mac with non-Apple compilers. Solution: Remove the -no-cpp-precomp flag.
(Misty De Meo)
---
src/auto/configure | 4 ++--
src/configure.in | 7 ++++---
src/osdef.sh | 6 +-----
src/version.c | 2 ++
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/auto/configure b/src/auto/configure
index bb079f0fc0..63da09823f 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4221,7 +4221,7 @@ rm -f core conftest.err conftest.$ac_objext \
MACOSX=yes
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
- CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
+ CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX"
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
@@ -4311,7 +4311,7 @@ fi
if test "$GCC" = yes -a "$local_dir" != no; then
echo 'void f(){}' > conftest.c
- have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
+ have_local_include=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
rm -f conftest.c conftest.o
fi
diff --git a/src/configure.in b/src/configure.in
index df28a246b7..8f0dce4c3e 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -204,7 +204,8 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
dnl TODO: use -arch i386 on Intel machines
- CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
+ dnl Removed -no-cpp-precomp, only for very old compilers.
+ CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX"
dnl If Carbon is found, assume we don't want X11
dnl unless it was specifically asked for (--with-x)
@@ -262,8 +263,8 @@ if test "$cross_compiling" = no; then
])
if test "$GCC" = yes -a "$local_dir" != no; then
echo 'void f(){}' > conftest.c
- dnl -no-cpp-precomp is needed for OS X 10.2 (Ben Fowler)
- have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
+ dnl Removed -no-cpp-precomp, only needed for OS X 10.2 (Ben Fowler)
+ have_local_include=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
rm -f conftest.c conftest.o
fi
diff --git a/src/osdef.sh b/src/osdef.sh
index d7d4f2ac26..6f9fea28b5 100755
--- a/src/osdef.sh
+++ b/src/osdef.sh
@@ -47,11 +47,7 @@ cat << EOF > osdef0.c
#endif
EOF
-# Mac uses precompiled headers, but we need real headers here.
-case `uname` in
- Darwin) $CC -I. -I$srcdir -E -no-cpp-precomp osdef0.c >osdef0.cc;;
- *) $CC -I. -I$srcdir -E osdef0.c >osdef0.cc;;
-esac
+$CC -I. -I$srcdir -E osdef0.c >osdef0.cc
# insert a space in front of each line, so that a function name at the
# start of the line is matched with "[)*, ]\1[ (]"
diff --git a/src/version.c b/src/version.c
index 93faccbdf0..a054f62c7b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 68,
/**/
67,
/**/
--
GitLab