diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-21 19:08:55 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-21 19:08:55 +0200 |
| commit | 259a90f7ce4d6d983a7fe5461da88cc52c46d9fe (patch) | |
| tree | e15f3d4896655a91282e180b296675aef069a9f7 | |
| parent | 405dadb63ea2b7aa4c8c659807506a35a8a9504c (diff) | |
| download | vim-git-259a90f7ce4d6d983a7fe5461da88cc52c46d9fe.tar.gz | |
patch 8.0.1741: MS-Windows with msys2 cannot build Ruby staticallyv8.0.1741
Problem: MS-Windows with msys2 cannot build Ruby statically.
Solution: Add RUBY_VERSION to CFLAGS later. (Gray Wolf, closes #2833)
| -rw-r--r-- | src/Make_cyg_ming.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index b21a1d40a..d51b6ea89 100644 --- 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 index 7ebc07175..b1b7f4afa 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1741, +/**/ 1740, /**/ 1739, |