diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-12-28 21:36:56 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-12-28 21:36:56 +0100 |
commit | 864a28b6a6ae4f1a56e230be26bc6d13e3f8b3d9 (patch) | |
tree | c1002abbe3cdce8579ff2a192ef46a0ee43ddbc3 /src | |
parent | 41a834d1e3dbf9c8759737bcd6524159a9b93d2a (diff) |
patch 8.2.2241: Build with Ruby and clang may failv8.2.2241
Problem: Build with Ruby and clang may fail.
Solution: Adjust congigure and sed script. (Ozaki Kiichi, closes #7566)
Diffstat (limited to 'src')
-rwxr-xr-x | src/auto/configure | 3 | ||||
-rw-r--r-- | src/configure.ac | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index f2486e9c4a..ebeed2cf4f 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7651,6 +7651,9 @@ $as_echo "$rubyhdrdir" >&6; } RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS" RUBY_LIBS= fi + if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then + RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec" + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5 $as_echo "not found; disabling Ruby" >&6; } diff --git a/src/configure.ac b/src/configure.ac index c024f65216..d13e3783ce 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2001,6 +2001,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS" RUBY_LIBS= fi + if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then + RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec" + fi else AC_MSG_RESULT(not found; disabling Ruby) fi diff --git a/src/version.c b/src/version.c index 39d2f26e15..e9327f19b0 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2241, +/**/ 2240, /**/ 2239, |