diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-17 05:52:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-17 05:52:21 +0000 |
| commit | a4f2606b2d9297f5978e8a935c7b7a8e22215c49 (patch) | |
| tree | b3c7a69b0b3f0b9cd416ddcd9db10708647f8f0c /win32 | |
| parent | e28a7c204d1e782b38d10f5775062ae329cbbaea (diff) | |
LIBRUBY_A with exts
* Makefile.in, win32/Makefile.sub (LIBRUBY_A): link with extension
libraries if EXTSTATIC is set, so that static-ruby would work
too.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 9ac87ab6e3..6cfb917acb 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1064,6 +1064,9 @@ PRE_LIBRUBY_UPDATE = !endif $(LIBRUBY_A): $(OBJS) $(INITOBJS) +!if "$(EXTSTATIC)" != "" + @-$(PRE_LIBRUBY_UPDATE) +!endif $(ECHO) linking static-library $(@:\=/) $(Q) $(AR) $(ARFLAGS)$@ $(OBJS) $(INITOBJS) @@ -1073,7 +1076,9 @@ $(LIBRUBY): $(RUBYDEF) $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res @echo $(DLDOBJS) +!if "$(EXTSTATIC)" == "" @-$(PRE_LIBRUBY_UPDATE) +!endif $(ECHO) linking shared-library $(@:\=/) $(Q) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \ $(RUBY_SO_NAME).res $(SOLIBS) $(EXTSOLIBS) $(LIBS) -Fe$@ -link $(LDFLAGS) \ |