From c2b0992156ccb65361eddd4c00d3a35593b0aaea Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 3 Jul 2014 03:40:24 +0000 Subject: configure.in: fix static-linked-ext * configure.in (--with-static-linked-ext): fix for extensions to be linked statically. * Makefile.in, common.mk: use ENCSTATIC for enc directory. * ext/extmk.rb: supply dependencies of statically linked extension libraries. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/extmk.rb b/ext/extmk.rb index b11010feeb..3a240aad0b 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -716,7 +716,11 @@ if $configure_only and $command_output mf.puts mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})" submake = "$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS)" - mf.puts "all static:\n\t#{submake} #{rubies.join(' ')}\n" + mf.puts "all static: $(EXTOBJS)\n\t#{submake} #{rubies.join(' ')}\n" + $extobjs.each do |tgt| + mf.puts "#{tgt}: #{File.dirname(tgt)}/static" + end + mf.puts "#{rubies.join(' ')}: $(EXTOBJS)" rubies.each do |tgt| mf.puts "#{tgt}:\n\t#{submake} $@" end -- cgit v1.2.3