initial import

[patches.git] / catalyst-use-subarch.patch

Index: modules/generic_stage_target.py
===================================================================
--- modules/generic_stage_target.py	(revision 1206)
+++ modules/generic_stage_target.py	(working copy)
@@ -57,11 +57,14 @@ class generic_stage_target(generic_targe
 		
 		if self.settings.has_key("chost"):
 			hostmachine = self.settings["chost"].split("-")[0]
-		else:
-			hostmachine = os.uname()[4]
-		if not machinemap.has_key(hostmachine):
-			raise CatalystError, "Unknown host machine type "+hostmachine
-		self.settings["hostarch"] = machinemap[hostmachine]
+			if not machinemap.has_key(hostmachine):
+				raise CatalystError, "Unknown host machine type "+hostmachine
+			self.settings["hostarch"] = machinemap[hostmachine]
+		else:
+			hostmachine = self.settings["subarch"]
+			if machinemap.has_key(hostmachine):
+				hostmachine = machinemap[hostmachine]
+			self.settings["hostarch"] = hostmachine
 		if self.settings.has_key("cbuild"):
 			buildmachine = self.settings["cbuild"].split("-")[0]
 		else: