X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=7faefeb456f3953548084782c63079fc466a59fc;hb=8170b77be8c1ec66f4e860fe88dafa791031e57f;hp=8e618deb4ae9de2c78e3d1ec8e169f829652c8c3;hpb=40177b0cfc0d4e67f971941f632e4f1f7e7c3f88;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 8e618de..7faefeb 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)
@@ -110,8 +108,10 @@ Architecture::Architecture(Builder &b, const string &spec):
 	{
 		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"));
-		staticlib_patterns.push_back(Pattern("lib%.dll.a"));
 		executable_patterns.push_back(Pattern("%.exe"));
 	}
 	else
@@ -122,51 +122,19 @@ Architecture::Architecture(Builder &b, const string &spec):
 	}
 }
 
-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(i->second[0]=='-')
-			return cross_prefix+i->second;
-		else
-			return i->second;
-	}
-
-	const Architecture &native_arch = builder.get_native_arch();
-	if(this!=&native_arch)
-	{
-		if(!cross_prefix.empty())
-			return cross_prefix+"-"+native_arch.get_tool(t);
-		else
-			return native_arch.get_tool(t);
-	}
-	else
-		throw invalid_argument("Unknown tool");
-}
-
 bool Architecture::match_name(const string &pattern) const
 {
-	vector<string> parts = split(pattern, "-");
+	bool negate = (pattern[0]=='!');
+	vector<string> parts = split(pattern.substr(negate), "-");
 	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
 		string part = resolve_alias(*i);
 		if((part=="32" && bits==32) || (part=="64" && bits==64))
 			;
 		else if(part!=type && part!=cpu && part!=system)
-			return false;
+			return negate;
 	}
-	return true;
+	return !negate;
 }
 
 string Architecture::resolve_alias(const string &part) const
@@ -227,13 +195,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;
 }