thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
Problem:    MS-Windows with msys2 cannot build Ruby statically.
Solution:   Add RUBY_VERSION to CFLAGS later. (Gray Wolf, closes #2833)
This commit is contained in:
Bram Moolenaar
2018-04-21 19:08:55 +02:00
parent 405dadb63e
commit 259a90f7ce
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Make_cyg_ming.mak
View File

@@ -458,7 +458,6 @@ RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-
endif endif
ifeq (no, $(DYNAMIC_RUBY)) ifeq (no, $(DYNAMIC_RUBY))
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
CFLAGS += -DRUBY_VERSION=$(RUBY_VER)
endif endif
endif # RUBY endif # RUBY
@@ -538,6 +537,9 @@ ifeq (yes, $(DYNAMIC_RUBY))
CFLAGS += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\" CFLAGS += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
CFLAGS += -DDYNAMIC_RUBY_VER=$(RUBY_VER) CFLAGS += -DDYNAMIC_RUBY_VER=$(RUBY_VER)
endif endif
ifeq (no, $(DYNAMIC_RUBY))
CFLAGS += -DRUBY_VERSION=$(RUBY_VER)
endif
ifneq ($(findstring w64-mingw32,$(CC)),) ifneq ($(findstring w64-mingw32,$(CC)),)
# A workaround for MinGW-w64 # A workaround for MinGW-w64
CFLAGS += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE CFLAGS += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1741,
/**/ /**/
1740, 1740,
/**/ /**/