diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-04 17:27:49 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-04 17:27:49 +0000 |
commit | 1e6a1012374367b812e98eedf940feb2e3068153 (patch) | |
tree | 738ae3497ea1a4108e74b0884872472b6db8404b | |
parent | 34c3ac0e2d4f3bf3522e3bc6c5cc5c01b796620c (diff) | |
download | ruby-1e6a1012374367b812e98eedf940feb2e3068153.tar.gz |
extmk.rb: no EXTOBJS to main if enable-shared
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | ext/extmk.rb | 1 |
2 files changed, 8 insertions, 0 deletions
@@ -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 |