summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index be69505431..ef4812da13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 1 20:03:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (have_framework): try as Objective-C.
+ https://twitter.com/nagachika/status/120294447660539904
+
Sun Oct 2 08:43:25 2011 Kazuki Tsujimoto <kazuki@callcc.net>
* vm.c (rb_thread_mark), cont.c (cont_mark): self pointer should not
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 59c2c8509a..c25a2dcddc 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -947,7 +947,7 @@ end
def have_framework(fw, &b)
checking_for fw do
src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}"
- if try_link(src, opt = "-framework #{fw}", &b)
+ if try_link(src, opt = "-ObjC -framework #{fw}", &b)
$defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp))
$LDFLAGS << " " << opt
true