summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-26 20:09:11 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-26 20:09:11 +0200
commit92c098d18e435a7a762409744ebe2dbb3746ed77 (patch)
treef40f79621fd985c2cb126ef75be1399ab7b39d1c /ci
parent285b189260e2d753454449e429f2caa17e1c39a5 (diff)
patch 8.2.0828: Travis: regexp patttern doesn't work everywherev8.2.0828
Problem: Travis: regexp patttern doesn't work everywhere. Solution: Use [:blank:] instead of \b. (Ozaki Kiichi, closes #6146)
Diffstat (limited to 'ci')
-rw-r--r--ci/config.mk.clang.sed3
-rw-r--r--ci/config.mk.gcc.sed2
-rw-r--r--ci/config.mk.sed4
3 files changed, 5 insertions, 4 deletions
diff --git a/ci/config.mk.clang.sed b/ci/config.mk.clang.sed
index 40c6705ac3..da6044d830 100644
--- a/ci/config.mk.clang.sed
+++ b/ci/config.mk.clang.sed
@@ -1 +1,2 @@
-/^RUBY_CFLAGS\b/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
+/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
+/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
diff --git a/ci/config.mk.gcc.sed b/ci/config.mk.gcc.sed
index 3b11569eb0..f46e488488 100644
--- a/ci/config.mk.gcc.sed
+++ b/ci/config.mk.gcc.sed
@@ -1 +1 @@
-/^CFLAGS\b/s/$/ -Wno-error=maybe-uninitialized/
+/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=maybe-uninitialized/
diff --git a/ci/config.mk.sed b/ci/config.mk.sed
index 31682787eb..cd2cd9c452 100644
--- a/ci/config.mk.sed
+++ b/ci/config.mk.sed
@@ -1,2 +1,2 @@
-/^CFLAGS\b/s/$/ -Wall -Wextra -Wshadow -Werror/
-/^PERL_CFLAGS\b/s/$/ -Wno-error=unused-function/
+/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
+/^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unused-function/