X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=fd31bcdbfd942a9ad05146d73e7dbb73fcecc38b;hb=7606161ee4a6fd13c2f5ddca413ba3582df66f03;hp=e0b69667952c64c1ad2e70229e5c4e951a128d7f;hpb=4240871c17854e2afccdcc37ce8f3464f8091a3f;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
index e0b6966..fd31bcd 100644
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -84,8 +84,6 @@ Architecture::Architecture(Builder &b, const string &spec):
 		const Architecture &native_arch = builder.get_native_arch();
 		if(type.empty())
 			type = native_arch.type;
-		if(cpu.empty())
-			cpu = native_arch.cpu;
 		if(system.empty())
 			system = native_arch.system;
 		if(!bits)
@@ -105,39 +103,23 @@ Architecture::Architecture(Builder &b, const string &spec):
 	if(!cpu.empty())
 		name += format("-%s", cpu);
 	name += format("-%d-%s", bits, system);
-}
-
-void Architecture::set_tool(const string &t, const string &p)
-{
-	tools[t] = p;
-}
-
-void Architecture::set_cross_prefix(const string &p)
-{
-	cross_prefix = p;
-}
 
-std::string Architecture::get_tool(const string &t) const
-{
-	StringMap::const_iterator i = tools.find(t);
-	if(i!=tools.end())
+	if(system=="windows")
 	{
-		if(i->second[0]=='-')
-			return cross_prefix+i->second;
-		else
-			return i->second;
+		sharedlib_patterns.push_back(Pattern("%.dll"));
+		sharedlib_patterns.push_back(Pattern("lib%.dll"));
+		/* XXX Hack: Consider import libraries (*.dll.a) as dynamic libraries,
+		even though technically they are linked statically. */
+		sharedlib_patterns.push_back(Pattern("lib%.dll.a"));
+		staticlib_patterns.push_back(Pattern("lib%.a"));
+		executable_patterns.push_back(Pattern("%.exe"));
 	}
-
-	const Architecture &native_arch = builder.get_native_arch();
-	if(this!=&native_arch)
+	else
 	{
-		if(!cross_prefix.empty())
-			return cross_prefix+"-"+native_arch.get_tool(t);
-		else
-			return native_arch.get_tool(t);
+		sharedlib_patterns.push_back(Pattern("lib%.so"));
+		staticlib_patterns.push_back(Pattern("lib%.a"));
+		executable_patterns.push_back(Pattern("%"));
 	}
-	else
-		throw invalid_argument("Unknown tool");
 }
 
 bool Architecture::match_name(const string &pattern) const
@@ -212,13 +194,7 @@ void Architecture::parse_specification(const string &spec)
 
 
 Architecture::Loader::Loader(Architecture &a):
-	arch(a)
+	DataFile::ObjectLoader<Architecture>(a)
 {
 	add("prefix", &Architecture::cross_prefix);
-	add("tool",   &Loader::tool);
-}
-
-void Architecture::Loader::tool(const string &t, const string &p)
-{
-	arch.tools[t] = p;
 }