зеркало из https://github.com/github/ruby.git
fix static-linked-ext
* 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:
Родитель
7333fbf0f7
Коммит
0a7aada5d1
|
@ -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.
|
* enc/encinit.c.erb: use %-lines to adjust indent in the generated file.
|
||||||
|
|
||||||
|
|
|
@ -1995,7 +1995,8 @@ if TkLib_Config["tcltk-framework"]
|
||||||
end
|
end
|
||||||
end
|
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
|
setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче