diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-02 01:03:30 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-02 01:03:30 +0000 |
commit | 49cc468ad4393872b5407ca89991b49a7b82bcea (patch) | |
tree | 9a256a670fc0e1bbc42e2e00392e951573ff7052 | |
parent | bc07265ceb9ca1c2d9329e614240b6ada4ff2b5c (diff) | |
download | ruby-49cc468ad4393872b5407ca89991b49a7b82bcea.tar.gz |
* lib/mkmf.rb (have_framework): try as Objective-C.
https://twitter.com/nagachika/status/120294447660539904
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 |