aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--win32/Makefile.sub2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 162112f41d..6f6b87cf29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 21 19:48:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/Makefile.sub ($(LIBRUBY_SO)): needs additional libraries
+ for extension libraries to link statically.
+ [ruby-core:70499] [Feature #9018]
+
Fri Aug 21 18:49:22 2015 Koichi Sasada <ko1@atdot.net>
* include/ruby/ruby.h, cont.c, vm_trace.c: add a new event
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index db489ecb8c..741c0cff4d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1005,7 +1005,7 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@-$(PRE_LIBRUBY_UPDATE)
$(ECHO) linking shared-library $(@:\=/)
$(Q) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
- $(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \
+ $(RUBY_SO_NAME).res $(SOLIBS) $(EXTSOLIBS) $(LIBS) -Fe$@ -link $(LDFLAGS) \
$(LIBRUBY_DLDFLAGS)
@$(RM) dummy.lib dummy.exp
$(Q) $(LDSHARED_0)