summaryrefslogtreecommitdiff
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
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
-rw-r--r--ChangeLog4
-rw-r--r--ext/tk/extconf.rb4
-rw-r--r--lib/mkmf.rb2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 42c3602..52784f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 7dd6ca7..1a44ecc 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 187399b..a3a39df 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