summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xext/extmk.rb1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c7043184d..3a3eed039c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Dec 5 02:27:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: as all extension objects including initializations
+ of ext and enc shouild be linked to libruby if enable-shared,
+ EXTOBJS should not be linked to main programs.
+ [ruby-core:66675] [Bug #10566]
+
Thu Dec 4 07:06:02 2014 Eric Wong <e@80x24.org>
* compile.c (rb_iseq_build_from_exception): entry->sp is unsigned
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 6d20f7a7f9..ca7a3dbd25 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -697,6 +697,7 @@ if $configure_only and $command_output
submakeopts = []
if enable_config("shared", $enable_shared)
submakeopts << 'DLDOBJS="$(EXTOBJS) $(ENCOBJS)"'
+ submakeopts << 'EXTOBJS='
submakeopts << 'EXTSOLIBS="$(EXTLIBS)"'
submakeopts << 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS)'
else