X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=faa62024e250aee1414caab7f52aed7ed794ebe8;hb=f41742cb2b21241634c123561b71ee1667cb1ff4;hp=cc0a50d3ace1ef23db89835b4ad240bce64e4956;hpb=4e2a160d94ca808cfb511cc2d38e115d989809f2;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index cc0a50d..faa6202 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -21,7 +21,7 @@
 using namespace std;
 using namespace Msp;
 
-GnuLinker::GnuLinker(Builder &b, const Architecture &a, const FS::Path &sysroot):
+GnuLinker::GnuLinker(Builder &b, const Architecture &a):
 	Tool(b, a, "LINK")
 {
 	input_suffixes.push_back(".o");
@@ -29,23 +29,6 @@ GnuLinker::GnuLinker(Builder &b, const Architecture &a, const FS::Path &sysroot)
 
 	processing_unit = COMPONENT;
 
-	if(!sysroot.empty())
-	{
-		build_info.sysroot = sysroot;
-		system_path.push_back(sysroot/"usr"/"lib");
-	}
-	else if(architecture->is_native())
-	{
-		system_path.push_back("/lib");
-		system_path.push_back("/usr/lib");
-		if(architecture->match_name("pc-32-linux"))
-			system_path.push_back("/usr/lib/i386-linux-gnu");
-		else if(architecture->match_name("pc-64-linux"))
-			system_path.push_back("/usr/lib/x86_64-linux-gnu");
-	}
-	else
-		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib");
-
 	default_linker = new Linker(*this, "CC");
 	cxx_linker = new Linker(*this, "CXX");
 }
@@ -113,6 +96,89 @@ Target *GnuLinker::create_install(Target &target) const
 		return 0;
 }
 
+void GnuLinker::do_prepare()
+{
+	bool path_found = false;
+	const FS::Path &sysroot = build_info.sysroot;
+
+	Tool &compiler = builder.get_toolchain().get_tool("CC");
+	if(dynamic_cast<GnuCompiler *>(&compiler))
+	{
+		compiler.prepare();
+		FileTarget *compiler_exe = compiler.get_executable();
+		if(compiler_exe)
+		{
+			ExternalTask::Arguments argv;
+			argv.push_back(compiler_exe->get_path().str());
+			argv.push_back("-Wl,--verbose");
+			argv.push_back("-nostdlib");
+			if(!sysroot.empty())
+				argv.push_back("--sysroot="+sysroot.str());
+
+			builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+			try
+			{
+				string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
+				string::size_type start = 0;
+				while(start<output.size())
+				{
+					string::size_type search_dir = output.find("SEARCH_DIR(\"", start);
+					if(search_dir==string::npos)
+						break;
+
+					search_dir += 12;
+					string::size_type end = output.find("\");", search_dir);
+					if(end==string::npos)
+						break;
+
+					FS::Path path;
+					if(!output.compare(search_dir, 2, "=/"))
+					{
+						search_dir += 2;
+						if(sysroot.empty())
+							path = "/";
+						else
+							path = sysroot;
+					}
+
+					path /= output.substr(search_dir, end-search_dir);
+					builder.get_logger().log("tools", format("Got %s system path: %s", tag, path));
+					system_path.push_back(path);
+					path_found = true;
+
+					start = end+3;
+				}
+			}
+			catch(...)
+			{ }
+		}
+	}
+
+	if(!path_found)
+	{
+		builder.get_logger().log("tools", format("No %s system path found, using defaults", tag));
+		if(!sysroot.empty())
+			system_path.push_back(sysroot/"usr/lib");
+		else if(architecture->is_native())
+		{
+			system_path.push_back("/lib");
+			system_path.push_back("/usr/lib");
+			if(architecture->match_name("pc-32-linux"))
+			{
+				system_path.push_back("/lib/i386-linux-gnu");
+				system_path.push_back("/usr/lib/i386-linux-gnu");
+			}
+			else if(architecture->match_name("pc-64-linux"))
+			{
+				system_path.push_back("/lib/x86_64-linux-gnu");
+				system_path.push_back("/usr/lib/x86_64-linux-gnu");
+			}
+		}
+		else
+			system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib");
+	}
+}
+
 Task *GnuLinker::run(const Target &) const
 {
 	throw logic_error("GnuLinker should not be run directly");
@@ -131,16 +197,6 @@ GnuLinker::Linker::Linker(GnuLinker &p, const string &ct):
 		throw invalid_argument("GnuLinker::Linker::Linker");
 }
 
-Target *GnuLinker::Linker::create_target(const list<Target *> &sources, const string &arg)
-{
-	return parent.create_target(sources, arg);
-}
-
-Target *GnuLinker::Linker::create_install(Target &target) const
-{
-	return parent.create_install(target);
-}
-
 string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
 {
 	string result = FS::basename(executable->get_path());
@@ -161,6 +217,10 @@ string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
 
 void GnuLinker::Linker::do_prepare()
 {
+	parent.prepare();
+	build_info = parent.get_build_info();
+	system_path = parent.get_system_path();
+
 	Tool &compiler = builder.get_toolchain().get_tool(compiler_tag);
 	if(dynamic_cast<GnuCompiler *>(&compiler))
 	{