From ea87854c5264e6101ba8965c5b9b1ee3cc44815d Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 23 Jan 2017 02:19:00 +0000 Subject: extinit.c.tmpl: drop after dot * template/extinit.c.tmpl: drop rest from the first dot in the base name of a feature is ignored since r30464. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/extmk.rb b/ext/extmk.rb index 977e0c991c..602d30826a 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -645,7 +645,7 @@ $extobjs ||= [] $extpath ||= [] $extflags ||= "" $extlibs ||= [] -extinits = {} +extinits = [] unless $extlist.empty? list = $extlist.dup built = [] @@ -660,7 +660,7 @@ unless $extlist.empty? next end base = File.basename(feature) - extinits[base] = feature + extinits << feature $extobjs << format("ext/%s/%s.%s", target, base, $LIBEXT) built << target end @@ -731,7 +731,7 @@ if $configure_only and $command_output mf.macro "EXTLIBS", $extlibs mf.macro "EXTSO", extso mf.macro "EXTLDFLAGS", $extflags.split - mf.macro "EXTINITS", extinits.map {|k, v| "#{k},#{v}"} + mf.macro "EXTINITS", extinits submakeopts = [] if enable_config("shared", $enable_shared) submakeopts << 'DLDOBJS="$(EXTOBJS) $(EXTENCS)"' -- cgit v1.2.3