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

mkmf.rb: fix framework option

Browse source 
* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-14 02:07:51 +00:00
parent e3a9aee513
commit 3976eb12ff
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2013-10-14 Nobuyoshi Nakada <nobu@ruby-lang.org> 2013-10-14 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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. * lib/mkmf.rb (create_makefile): ranlib on static library, not DLLIB.
2013-10-13 Andrew Grimm <andrew.j.grimm@gmail.com> 2013-10-13 Andrew Grimm <andrew.j.grimm@gmail.com>

4
ext/tk/extconf.rb
View file

@ -1487,8 +1487,8 @@ end
def setup_for_macosx_framework(tclver, tkver) def setup_for_macosx_framework(tclver, tkver)
# use framework, but no tclConfig.sh # use framework, but no tclConfig.sh
unless $LDFLAGS && $LDFLAGS.include?('-framework') unless $LIBS && $LIBS.include?('-framework')
($LDFLAGS ||= "") << ' -framework Tk -framework Tcl' ($LIBS ||= "") << ' -framework Tk -framework Tcl'
end end
if TkLib_Config["tcl-framework-header"] if TkLib_Config["tcl-framework-header"]

2
lib/mkmf.rb
View file

@ -1098,7 +1098,7 @@ SRC
# TODO: non-worse way than this hack, to get rid of separating # TODO: non-worse way than this hack, to get rid of separating
# option and its argument. # option and its argument.
$LDFLAGS << " -ObjC" unless /(\A|\s)-ObjC(\s|\z)/ =~ $LDFLAGS $LDFLAGS << " -ObjC" unless /(\A|\s)-ObjC(\s|\z)/ =~ $LDFLAGS
$LDFLAGS << opt $LIBS << opt
true true
else else
false false