summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorichizok <gclient.gaap@gmail.com>2021-12-28 15:51:45 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-28 15:51:45 +0000
commit8bb3fe4d4dcd27c02e903f6772fdc8fe2e9eba70 (patch)
tree8580fd12601cf226570353cd10d9f2ab2e24abc5 /ci
parentd9da86e94ea8dbaa056270a666892945c40a6674 (diff)
downloadvim-git-8bb3fe4d4dcd27c02e903f6772fdc8fe2e9eba70.tar.gz
patch 8.2.3922: cannot build with dynamic Ruby 3.1v8.2.3922
Problem: Cannot build with dynamic Ruby 3.1. Solution: Add "_EXTRA" variables for CI. Add missing functions. (Ozaki Kiichi, closes #9420)
Diffstat (limited to 'ci')
-rw-r--r--ci/config.mk.clang-12.sed4
-rw-r--r--ci/config.mk.clang.sed2
-rw-r--r--ci/config.mk.sed3
3 files changed, 5 insertions, 4 deletions
diff --git a/ci/config.mk.clang-12.sed b/ci/config.mk.clang-12.sed
index e305c5966..810b723c7 100644
--- a/ci/config.mk.clang-12.sed
+++ b/ci/config.mk.clang-12.sed
@@ -1,3 +1,3 @@
# Clang 12 (or Apple clang 13) and later makes a warning '-Wcompound-token-split-by-macro' enable by default.
-/^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=compound-token-split-by-macro/
-/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=compound-token-split-by-macro/
+/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=compound-token-split-by-macro/
+/^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=compound-token-split-by-macro/
diff --git a/ci/config.mk.clang.sed b/ci/config.mk.clang.sed
index da6044d83..9dc271c54 100644
--- a/ci/config.mk.clang.sed
+++ b/ci/config.mk.clang.sed
@@ -1,2 +1,2 @@
/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
-/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
+/^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
diff --git a/ci/config.mk.sed b/ci/config.mk.sed
index cd2cd9c45..51e7ec903 100644
--- a/ci/config.mk.sed
+++ b/ci/config.mk.sed
@@ -1,2 +1,3 @@
/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
-/^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unused-function/
+/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function/
+/^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter/