X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=a56d716780817cdd63f3e9536584bc242ac19b78;hb=f182274c67f6e22cef57df560d33cd180a72f167;hp=b2df14cbc9c90e7bff446411654ebf1ce445c7de;hpb=6e02286dcbd62b8f5ef56987c2298d54b689ad9c;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index b2df14c..a56d716 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -212,6 +212,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	argv.push_back(relative(bin.get_path(), work_dir).str());
 
 	bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
+	bool need_l_objc = false;
 
 	const Target::Dependencies &depends = target.get_dependencies();
 	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -220,7 +221,13 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		Target *tgt = (*i)->get_real_target();
 
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
+		{
 			argv.push_back(relative(obj->get_path(), work_dir).str());
+			/* XXX This is a hack.  A more generic way is needed for tools to pass
+			information down the chain. */
+			if(obj->get_tool()->get_tag()=="OBJC")
+				need_l_objc = true;
+		}
 		else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
 			argv.push_back((file?file:stlib)->get_path().str());
 		else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
@@ -239,6 +246,15 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		}
 	}
 
+	for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
+		if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
+		{
+			argv.push_back("-framework");
+			argv.push_back(i->substr(0, i->size()-10));
+		}
+
+	if(need_l_objc)
+		argv.push_back("-lobjc");
 	if(static_link_ok)
 		argv.push_back("-static");
 	else if(architecture->get_system()=="windows")