X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=fd31bcdbfd942a9ad05146d73e7dbb73fcecc38b;hb=894c4bd9d58df50c38c7a656cf085c48581439ef;hp=a416551f23312b74febc418f2c4e41b7f9a5049e;hpb=be6c1ae1dcc97cb3e3019c0384f1bc933fcd321c;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
index a416551..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)
@@ -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,11 +122,6 @@ Architecture::Architecture(Builder &b, const string &spec):
 	}
 }
 
-void Architecture::set_cross_prefix(const string &p)
-{
-	cross_prefix = p;
-}
-
 bool Architecture::match_name(const string &pattern) const
 {
 	vector<string> parts = split(pattern, "-");
@@ -199,7 +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);
 }