X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=b2516d6394eab3ddec5733d10347e0d43923e721;hb=7bcd4fef81679dedcabc5a58b12511a6b52c4fe4;hp=9ae5d640e3e8fcec5106133fce9c2a422fa11328;hpb=33202532d4afbebdef4047f6bd216eca22d27813;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 9ae5d64..b2516d6 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -115,7 +115,14 @@ Task *GnuLinker::run(const Target &) const
 GnuLinker::Linker::Linker(GnuLinker &p, const string &ct):
 	SubTool(p),
 	compiler_tag(ct)
-{ }
+{
+	if(compiler_tag=="CC")
+		set_command("gcc", true);
+	else if(compiler_tag=="CXX")
+		set_command("g++", true);
+	else
+		throw invalid_argument("GnuLinker::Linker::Linker");
+}
 
 Target *GnuLinker::Linker::create_target(const list<Target *> &sources, const string &arg)
 {
@@ -150,18 +157,6 @@ void GnuLinker::Linker::do_prepare()
 		compiler.prepare();
 		executable = compiler.get_executable();
 	}
-	else
-	{
-		string command;
-		if(compiler_tag=="CC")
-			command = "gcc";
-		else if(compiler_tag=="CXX")
-			command = "g++";
-		else
-			throw invalid_argument("GnuLinker::Linker::Linker");
-
-		set_executable(command, true);
-	}
 }
 
 Task *GnuLinker::Linker::run(const Target &target) const
@@ -180,7 +175,25 @@ 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();
@@ -188,7 +201,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		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();
@@ -199,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)
@@ -207,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))
@@ -226,6 +246,8 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		}
 	}
 
+	if(need_l_objc)
+		argv.push_back("-lobjc");
 	if(static_link_ok)
 		argv.push_back("-static");
 	else if(architecture->get_system()=="windows")