kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

fix static-linked-ext

Browse source 
* ext/extmk.rb: EXTLDFLAGS also needs to be passed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-05-17 01:34:35 +00:00
parent b85e3e70ee
commit 77c4a51cef
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu May 17 10:34:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: EXTLDFLAGS also needs to be passed.
Wed May 16 15:44:22 2012 Yuki Yugui Sonoda <yugui@google.com> Wed May 16 15:44:22 2012 Yuki Yugui Sonoda <yugui@google.com>
* configure.in: Fix an unbalanced quote. * configure.in: Fix an unbalanced quote.

4
ext/extmk.rb
View file

@ -636,6 +636,7 @@ if $configure_only and $command_output
mf.puts "EXTOBJS = " mf.puts "EXTOBJS = "
mf.puts "EXTLIBS = " mf.puts "EXTLIBS = "
end end
mf.puts "EXTLDFLAGS = #{$extflags}"
mf.puts mf.puts
targets = %w[all install static install-so install-rb clean distclean realclean] targets = %w[all install static install-so install-rb clean distclean realclean]
targets.each do |tgt| targets.each do |tgt|
@ -649,7 +650,8 @@ if $configure_only and $command_output
mf.puts mf.puts
mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})" mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})"
rubies.each do |tgt| rubies.each do |tgt|
mf.puts "#{tgt}:\n\t$(Q)$(MAKE) $(MFLAGS) EXTOBJS=\"$(EXTOBJS)\" EXTLIBS=\"$(EXTLIBS)\" $@" mf.print "#{tgt}:\n\t$(Q)$(MAKE) "
mf.puts '$(MFLAGS) EXTOBJS="$(EXTOBJS)" EXTLIBS="$(EXTLIBS)" EXTLDFLAGS="$(EXTLDFLAGS)" $@'
end end
mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) $@" mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) $@"
mf.puts mf.puts