patch 8.0.1741: MS-Windows with msys2 cannot build Ruby statically

Problem: MS-Windows with msys2 cannot build Ruby statically. Solution: Add RUBY_VERSION to CFLAGS later. (Gray Wolf, closes #2833)
vim · Apr 21, 2018 · 259a90f · 259a90f
1 parent 405dadb
commit 259a90f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
@@ -458,7 +458,6 @@ RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-
 endif
 ifeq (no, $(DYNAMIC_RUBY))
 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
-CFLAGS += -DRUBY_VERSION=$(RUBY_VER)
 endif
 
 endif # RUBY
@@ -538,6 +537,9 @@ ifeq (yes, $(DYNAMIC_RUBY))
 CFLAGS += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
 CFLAGS += -DDYNAMIC_RUBY_VER=$(RUBY_VER)
 endif
+ifeq (no, $(DYNAMIC_RUBY))
+CFLAGS += -DRUBY_VERSION=$(RUBY_VER)
+endif
 ifneq ($(findstring w64-mingw32,$(CC)),)
 # A workaround for MinGW-w64
 CFLAGS += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE

diff --git a/src/version.c b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1741,
 /**/
     1740,
 /**/