From 3976eb12ff5596f70350a3697389eedd9aa1710e Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 14 Oct 2013 02:07:51 +0000 Subject: mkmf.rb: fix framework option * 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 --- ext/tk/extconf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/tk/extconf.rb') 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"] -- cgit v1.2.3