aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

updated for version 7.4.068

Browse Source 
Problem:    Cannot build Vim on Mac with non-Apple compilers.
Solution:   Remove the -no-cpp-precomp flag. (Misty De Meo)
This commit is contained in:
Bram Moolenaar
2013-11-04 04:57:50 +01:00
parent f332a656c3
commit 0958e0fbe7
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auto/configure vendored
View File

@@ -4221,7 +4221,7 @@ rm -f core conftest.err conftest.$ac_objext \
MACOSX=yes MACOSX=yes
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" 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. # 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 \ 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 if test "$GCC" = yes -a "$local_dir" != no; then
echo 'void f(){}' > conftest.c 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"` have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
rm -f conftest.c conftest.o rm -f conftest.c conftest.o
fi fi

7
src/configure.in
View File

@@ -204,7 +204,8 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
dnl TODO: use -arch i386 on Intel machines 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 If Carbon is found, assume we don't want X11
dnl unless it was specifically asked for (--with-x) 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 if test "$GCC" = yes -a "$local_dir" != no; then
echo 'void f(){}' > conftest.c echo 'void f(){}' > conftest.c
dnl -no-cpp-precomp is needed for OS X 10.2 (Ben Fowler) dnl Removed -no-cpp-precomp, only 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"` 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"` have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
rm -f conftest.c conftest.o rm -f conftest.c conftest.o
fi fi

6
src/osdef.sh
View File

@@ -47,11 +47,7 @@ cat << EOF > osdef0.c
#endif #endif
EOF EOF
# Mac uses precompiled headers, but we need real headers here. $CC -I. -I$srcdir -E osdef0.c >osdef0.cc
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
# insert a space in front of each line, so that a function name at the # insert a space in front of each line, so that a function name at the
# start of the line is matched with "[)*, ]\1[ (]" # start of the line is matched with "[)*, ]\1[ (]"

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
68,
/**/ /**/
67, 67,
/**/ /**/