[前][次][番号順一覧][スレッド一覧]

ruby-changes:23616

From: nobu <ko1@a...>
Date: Thu, 17 May 2012 10:34:45 +0900 (JST)
Subject: [ruby-changes:23616] nobu:r35667 (trunk): fix static-linked-ext

nobu	2012-05-17 10:34:35 +0900 (Thu, 17 May 2012)

  New Revision: 35667

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35667

  Log:
    fix static-linked-ext
    
    * ext/extmk.rb: EXTLDFLAGS also needs to be passed.

  Modified files:
    trunk/ChangeLog
    trunk/ext/extmk.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35666)
+++ ChangeLog	(revision 35667)
@@ -1,3 +1,7 @@
+Thu May 17 10:34:35 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb: EXTLDFLAGS also needs to be passed.
+
 Wed May 16 15:44:22 2012  Yuki Yugui Sonoda  <yugui@g...>
 
 	* configure.in: Fix an unbalanced quote.
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 35666)
+++ ext/extmk.rb	(revision 35667)
@@ -636,6 +636,7 @@
       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 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]