changeset 24:2020ae1f1b84

put platform in settings.
author hanwen <hanwen@xs4all.nl>
date Fri, 25 Nov 2005 14:42:52 +0100
parents 7ed596939bfc
children 15ee8bc879c4
files driver.py specs/framework.py specs/gub.py
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/driver.py	Fri Nov 25 14:39:08 2005 +0100
+++ b/driver.py	Fri Nov 25 14:42:52 2005 +0100
@@ -87,6 +87,7 @@
 		platform = 'mingw'
 
 	settings.verbose = verbose
+	settings.platform = platform
 	
 	if not os.path.exists (settings.targetdir):
 		settings.create_dirs ()
--- a/specs/framework.py	Fri Nov 25 14:39:08 2005 +0100
+++ b/specs/framework.py	Fri Nov 25 14:42:52 2005 +0100
@@ -15,8 +15,12 @@
 		return str
 	
 	def configure_command (self):
-		return gub.Target_package.configure_command (self) \
+		cmd = gub.Target_package.configure_command (self) \
 		       + ' --disable-csharp'
+
+		if self.settings.platform == 'mac':
+			cmd = re.sub ('--config-cache ', '', cmd) 
+		return cmd
 	
 class Libiconv (gub.Target_package):
 	pass
--- a/specs/gub.py	Fri Nov 25 14:39:08 2005 +0100
+++ b/specs/gub.py	Fri Nov 25 14:42:52 2005 +0100
@@ -17,6 +17,9 @@
 
 	return 0 
 
+def join_lines (str):
+	return re.sub ('\n', ' ', str)
+
 def system (cmd, ignore_error = False, verbose = False, env = {}):
 	"Run multiple lines as multiple commands."