diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,5 +1,9 @@ 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. 2013-10-13 Andrew Grimm <andrew.j.grimm@gmail.com> diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 7dd6ca793e..1a44eccb31 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1487,8 +1487,8 @@ end 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"] diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 187399b71c..a3a39dfe3c 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1098,7 +1098,7 @@ SRC # 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 |