From 77c4a51cef777dbbd7b8e4b8e010d6c5d11f9208 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 17 May 2012 01:34:35 +0000 Subject: [PATCH] fix static-linked-ext * 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 --- ChangeLog | 4 ++++ ext/extmk.rb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc927f984a..7534638f5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu May 17 10:34:35 2012 Nobuyoshi Nakada + + * ext/extmk.rb: EXTLDFLAGS also needs to be passed. + Wed May 16 15:44:22 2012 Yuki Yugui Sonoda * configure.in: Fix an unbalanced quote. diff --git a/ext/extmk.rb b/ext/extmk.rb index 3f1f1aca0a..7122cc0f67 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -636,6 +636,7 @@ if $configure_only and $command_output mf.puts "EXTOBJS = " mf.puts "EXTLIBS = " end + mf.puts "EXTLDFLAGS = #{$extflags}" mf.puts targets = %w[all install static install-so install-rb clean distclean realclean] targets.each do |tgt| @@ -649,7 +650,8 @@ if $configure_only and $command_output mf.puts mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})" 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 mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) $@" mf.puts