Skip to content

Commit

Permalink
enc/encinit.c for static-linked-ext
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nobu committed Jul 11, 2012
1 parent 0405139 commit c9e4da2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Wed Jul 11 17:36:39 2012 Nobuyoshi Nakada <[email protected]>

* 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 <[email protected]>

* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): nonstatic initializer
Expand Down
2 changes: 1 addition & 1 deletion ext/extmk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ def mf.macro(name, values, max = 70)
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)" ]
Expand Down

0 comments on commit c9e4da2

Please sign in to comment.