ruby-changes:23620
From: nobu <ko1@a...>
Date: Thu, 17 May 2012 10:56:17 +0900 (JST)
Subject: [ruby-changes:23620] nobu:r35671 (trunk): fix static-linked-ext
nobu 2012-05-17 10:55:00 +0900 (Thu, 17 May 2012) New Revision: 35671 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35671 Log: fix static-linked-ext * ext/tk/extconf.rb: add -l options to $libs not $LDFLAGS, to be passed to EXTLIBS in exts.mk. Modified files: trunk/ChangeLog trunk/ext/tk/extconf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 35670) +++ ChangeLog (revision 35671) @@ -1,5 +1,8 @@ -Thu May 17 10:39:36 2012 Nobuyoshi Nakada <nobu@r...> +Thu May 17 10:54:58 2012 Nobuyoshi Nakada <nobu@r...> + * ext/tk/extconf.rb: add -l options to $libs not $LDFLAGS, to be + passed to EXTLIBS in exts.mk. + * enc/encinit.c.erb: use %-lines to adjust indent in the generated file. * lib/mkmf.rb (MakeMakefile#have_framework): combine -framework option Index: ext/tk/extconf.rb =================================================================== --- ext/tk/extconf.rb (revision 35670) +++ ext/tk/extconf.rb (revision 35671) @@ -1995,7 +1995,8 @@ end end end - $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, '\1=') << ' -ltk -ltcl' + $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, '\1=') + $libs << ' -ltk -ltcl' setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/