diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-20 22:31:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-20 22:31:41 +0200 |
| commit | 6176697203b0f168f4566597e15d8488b62ad490 (patch) | |
| tree | 55ab6138712e52deb3d7bf7253f7a01f8163576f | |
| parent | 5d69da462f584a3aefb3427b127334bf9af3a4b0 (diff) | |
patch 8.0.1739: MS-Windows with msys2 cannot build Ruby staticallyv8.0.1739
Problem: MS-Windows with msys2 cannot build Ruby statically.
Solution: Define RUBY_VERSION. (Gray Wolf, closes #2826)
| -rw-r--r-- | src/Make_cyg_ming.mak | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 81dd9378f6..b21a1d40a1 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -390,7 +390,7 @@ endif # Ruby interface: # RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak) -# DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) +# DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically, "no" for static) # RUBY_VER=[Ruby version, eg 19, 22] (default is 22) # RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0] # (default is 2.2.0) @@ -458,6 +458,7 @@ 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 diff --git a/src/version.c b/src/version.c index 2b5bf045b8..a73994b93b 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 */ /**/ + 1739, +/**/ 1738, /**/ 1737, |