From 15bf3182c65bcd84fe1f4815c767730839f39082 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 19 May 2012 10:04:40 +0000 Subject: [PATCH] static-linked-ext: all linked ruby * ext/extmk.rb (command_output): ENCOBJS is needed for all linked ruby, if --disable-shared and --with-static-linked-ext. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- ext/extmk.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b5a144285..b42d2d6c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Sat May 19 14:57:31 2012 Nobuyoshi Nakada +Sat May 19 19:04:38 2012 Nobuyoshi Nakada + + * ext/extmk.rb (command_output): ENCOBJS is needed for all linked + ruby, if --disable-shared and --with-static-linked-ext. * ext/extmk.rb (command_output): dmyext is needed as DLDOBJS if no static lined extensions. diff --git a/ext/extmk.rb b/ext/extmk.rb index 7777f9b8f8..81faca8bf6 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -666,7 +666,7 @@ if $configure_only and $command_output mf.print %[DLDOBJS="$(EXTOBJS)" SOLIBS="$(ENCOBJS) $(EXTLIBS)" ] mf.print 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) ' else - mf.print %[EXTOBJS="$(EXTOBJS)" EXTLIBS="$(EXTLIBS)" ] + mf.print %[EXTOBJS="$(EXTOBJS) $(ENCOBJS)" EXTLIBS="$(EXTLIBS)" ] end mf.puts 'EXTLDFLAGS="$(EXTLDFLAGS)" $@' end