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/tk/extconf.rb: add -l options to $libs not $LDFLAGS, to be
  passed to EXTLIBS in exts.mk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-05-17 01:55:00 +00:00
parent 7333fbf0f7
commit 0a7aada5d1
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Thu May 17 10:39:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
Thu May 17 10:54:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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.

3
ext/tk/extconf.rb
View file

@ -1995,7 +1995,8 @@ if TkLib_Config["tcltk-framework"]
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