From 259a90f7ce4d6d983a7fe5461da88cc52c46d9fe Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 21 Apr 2018 19:08:55 +0200 Subject: 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) --- src/Make_cyg_ming.mak | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Make_cyg_ming.mak') 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 -- cgit v1.2.1