summaryrefslogtreecommitdiff
path: root/ext/tk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-14 02:07:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-14 02:07:51 +0000
commit3976eb12ff5596f70350a3697389eedd9aa1710e (patch)
tree91de4c41a70ea560926d9cd92b08f438f957b565 /ext/tk
parente3a9aee5135a83db26860502a7d384520ab3626b (diff)
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
Diffstat (limited to 'ext/tk')
-rw-r--r--ext/tk/extconf.rb4
1 files changed, 2 insertions, 2 deletions
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"]