X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=6a2fcd54cdfd17d90f330f53f75b66b5bbe625e8;hb=3f0f721;hp=ea448acdcf3105980709bca561a1c1b3bc2ceb28;hpb=e516e78510ad455eebc0e06645c9f12943117525;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index ea448ac..6a2fcd5 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -144,8 +144,11 @@ string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
 		result += 'd';
 	if(binfo.strip)
 		result += 's';
-	result += ",l";
-	result += join(binfo.libs.begin(), binfo.libs.end(), ",l");
+	if(!binfo.libs.empty())
+	{
+		result += ",l";
+		result += join(binfo.libs.begin(), binfo.libs.end(), ",l");
+	}
 	return result;
 }
 
@@ -175,25 +178,45 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		argv.push_back("-shared");
 		argv.push_back("-fPIC");
 		if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
-			argv.push_back("-Wl,-soname,"+shlib->get_soname());
+		{
+			if(architecture->get_system()=="darwin")
+			{
+				argv.push_back("-install_name");
+				argv.push_back(shlib->get_soname());
+
+				const string &ver = shlib->get_package()->get_version();
+				const string &if_ver = shlib->get_package()->get_interface_version();
+				if(!ver.empty() && !if_ver.empty())
+				{
+					argv.push_back("-current_version");
+					argv.push_back(ver);
+					argv.push_back("-compatibility_version");
+					argv.push_back(if_ver);
+				}
+			}
+			else
+				argv.push_back("-Wl,-soname,"+shlib->get_soname());
+		}
 	}
 
-	const BuildInfo &binfo = comp.get_build_info();
+	BuildInfo binfo;
+	target.collect_build_info(binfo);
 	for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
 		argv.push_back("-L"+i->str());
 	if(binfo.strip)
 		argv.push_back("-s");
-	if(binfo.threads && architecture->get_system()!="windows")
+	if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
 		argv.push_back("-pthread");
 
 	const Architecture &native_arch = builder.get_native_arch();
-	if(architecture->get_bits()!=native_arch.get_bits())
+	if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
 		argv.push_back(format("-m%d", architecture->get_bits()));
 
 	argv.push_back("-o");
 	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)
@@ -202,7 +225,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))
@@ -221,6 +250,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")