diff options
| -rw-r--r-- | lib/mkmf.rb | 4 | ||||
| -rw-r--r-- | test/mkmf/test_framework.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index bc93fec6c4..6177e04f56 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1092,11 +1092,11 @@ SRC checking_for fw do src = cpp_include("#{fw}/#{header}") << "\n" "int main(void){return 0;}" opt = " -framework #{fw}" - if try_link(src, "-ObjC#{opt}", &b) + if try_link(src, opt, &b) or (objc = try_link(src, "-ObjC#{opt}", &b)) $defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp)) # 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 << " -ObjC" if objc and /(\A|\s)-ObjC(\s|\z)/ !~ $LDFLAGS $LIBS << opt true else diff --git a/test/mkmf/test_framework.rb b/test/mkmf/test_framework.rb index 3585f959f9..cad6b052d0 100644 --- a/test/mkmf/test_framework.rb +++ b/test/mkmf/test_framework.rb @@ -26,7 +26,9 @@ class TestMkmf def test_multi_frameworks assert(have_framework("CoreFoundation"), mkmflog("try as Objective-C")) - assert(have_framework("Cocoa"), mkmflog("try as Objective-C")) + create_framework("MkmfTest") do |fw| + assert(have_framework(fw), MKMFLOG) + end end def test_empty_framework |