From c9e4da2afc7d8c3db78e072cbef81b06effc7e91 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 11 Jul 2012 08:36:41 +0000 Subject: [PATCH] enc/encinit.c for static-linked-ext * ext/extmk.rb: append ENCOBJS to DLDOBJS but not EXTSOLIBS which is not a target, to compile enc/encinit.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/extmk.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5d92bb5451..0905fc6f31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 11 17:36:39 2012 Nobuyoshi Nakada + + * ext/extmk.rb: append ENCOBJS to DLDOBJS but not EXTSOLIBS which is + not a target, to compile enc/encinit.c. + Wed Jul 11 12:38:20 2012 NAKAMURA Usaku * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): nonstatic initializer diff --git a/ext/extmk.rb b/ext/extmk.rb index 069465e77f..587bfadce0 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -666,7 +666,7 @@ if $configure_only and $command_output mf.print "#{tgt}:\n\t$(Q)$(MAKE) " mf.print "$(MFLAGS) " if enable_config("shared", $enable_shared) - mf.print %[DLDOBJS="$(EXTOBJS)" EXTSOLIBS="$(ENCOBJS) $(EXTLIBS)" ] + mf.print %[DLDOBJS="$(EXTOBJS) $(ENCOBJS)" EXTSOLIBS="$(EXTLIBS)" ] mf.print 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) ' else mf.print %[EXTOBJS="$(EXTOBJS) $(ENCOBJS)" EXTLIBS="$(EXTLIBS)" ]