diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-06-21 13:41:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-06-21 13:41:08 +0200 |
| commit | 280a868a246eda3904eb925588f111b69e304878 (patch) | |
| tree | 6681f47c683ae7fb6b159e652bac02e098d61962 /src | |
| parent | 0e7c4b99c608d22fd1b8526e700420b248319b1f (diff) | |
| download | vim-git-280a868a246eda3904eb925588f111b69e304878.tar.gz | |
patch 7.4.750v7.4.750
Problem: Cannot build with clang 3.5 on Cygwin with perl enabled.
Solution: Strip "-fdebug-prefix-map" in configure. (Ken Takata)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/auto/configure | 5 | ||||
| -rw-r--r-- | src/configure.in | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/auto/configure b/src/auto/configure index a52d6977c..cdefc9c29 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5613,8 +5613,9 @@ $as_echo "OK" >&6; } fi done - perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ - -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//'` + perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ + -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//' \ + -e 's/-fdebug-prefix-map[^ ]*//g'` perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \ sed -e '/Warning/d' -e '/Note (probably harmless)/d' \ -e 's/-bE:perl.exp//' -e 's/-lc //'` diff --git a/src/configure.in b/src/configure.in index be3c6587f..80d70b0e5 100644 --- a/src/configure.in +++ b/src/configure.in @@ -942,8 +942,10 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then done AC_SUBST(vi_cv_perl_xsubpp) dnl Remove "-fno-something", it breaks using cproto. + dnl Remove "-fdebug-prefix-map", it isn't supported by clang. perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ - -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//'` + -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//' \ + -e 's/-fdebug-prefix-map[[^ ]]*//g'` dnl Remove "-lc", it breaks on FreeBSD when using "-pthread". perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \ sed -e '/Warning/d' -e '/Note (probably harmless)/d' \ diff --git a/src/version.c b/src/version.c index ac053e6f0..1ca7c5c88 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 750, +/**/ 749, /**/ 748, |