patch 7.4.750

Problem:    Cannot build with clang 3.5 on Cygwin with perl enabled.
Solution:   Strip "-fdebug-prefix-map" in configure. (Ken Takata)

diff --git a/src/auto/configure b/src/auto/configure
index a52d6977cca011915ef8b9b455169bdaefad888b..cdefc9c29943fd2b1bc08cde16fa3cad32ebf5fd 100755 (executable)
--- 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 be3c6587fe3501e6adaeeb3260ec5f2770a6ec45..80d70b0e50faec30e332ecba0cae6ba42b72977b 100644 (file)
--- 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 ac053e6f02271b3a55ea13483d9709269fcc661f..1ca7c5c8850882d6f0589947607589200a6f5b60 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    750,
 /**/
     749,
 /**/