nobu	2013-10-14 11:07:51 +0900 (Mon, 14 Oct 2013)

  New Revision: 43277

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

  Log:
    mkmf.rb: fix framework option
    
    * lib/mkmf.rb (have_framework): should append framework options to
      $LIBS, not $LDFLAGS.  the former is propagated to exts.mk when
      enable-static-linked-ext.

  Modified files:
    trunk/ChangeLog
    trunk/ext/tk/extconf.rb
    trunk/lib/mkmf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43276)
+++ ChangeLog	(revision 43277)
@@ -1,5 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
 2013-10-14  Nobuyoshi Nakada  <nobu@r...>
 
+	* lib/mkmf.rb (have_framework): should append framework options to
+	  $LIBS, not $LDFLAGS.  the former is propagated to exts.mk when
+	  enable-static-linked-ext.
+
 	* lib/mkmf.rb (create_makefile): ranlib on static library, not DLLIB.
 
 2013-10-13  Andrew Grimm  <andrew.j.grimm@g...>
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 43276)
+++ lib/mkmf.rb	(revision 43277)
@@ -1098,7 +1098,7 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1098
         # TODO: non-worse way than this hack, to get rid of separating
         # option and its argument.
         $LDFLAGS << " -ObjC" unless /(\A|\s)-ObjC(\s|\z)/ =~ $LDFLAGS
-        $LDFLAGS << opt
+        $LIBS << opt
         true
       else
         false
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 43276)
+++ ext/tk/extconf.rb	(revision 43277)
@@ -1487,8 +1487,8 @@ end https://github.com/ruby/ruby/blob/trunk/ext/tk/extconf.rb#L1487
 
 def setup_for_macosx_framework(tclver, tkver)
   # use framework, but no tclConfig.sh
-  unless $LDFLAGS && $LDFLAGS.include?('-framework')
-    ($LDFLAGS ||= "") << ' -framework Tk -framework Tcl'
+  unless $LIBS && $LIBS.include?('-framework')
+    ($LIBS ||= "") << ' -framework Tk -framework Tcl'
   end
 
   if TkLib_Config["tcl-framework-header"]

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