[banshee] [build] move gcc arch flags to darwin profile



commit c2d6bd48a46d7ab45878183bfcadd2fdd6fb902a
Author: Aaron Bockover <abockover novell com>
Date:   Thu Jan 7 17:44:31 2010 -0500

    [build] move gcc arch flags to darwin profile
    
    They're not valid flags for gcc on linux

 build/bundle/bockbuild/darwinprofile.py |    3 +++
 build/bundle/bockbuild/unixprofile.py   |   12 ++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/build/bundle/bockbuild/darwinprofile.py b/build/bundle/bockbuild/darwinprofile.py
index e3db9e7..d6ceb7b 100644
--- a/build/bundle/bockbuild/darwinprofile.py
+++ b/build/bundle/bockbuild/darwinprofile.py
@@ -12,11 +12,14 @@ class DarwinProfile (UnixProfile):
 			raise IOError ('Mac OS X SDK does not exist: %s' \
 				% self.mac_sdk_path)
 
+		self.gcc_arch_flags = [ '-m32', '-arch i386' ]
 		self.gcc_flags.extend ([
 			'-D_XOPEN_SOURCE',
 			'-isysroot %{mac_sdk_path}',
 			'-mmacosx-version-min=10.5'
 		])
+		self.gcc_flags.extend (self.gcc_arch_flags)
+		self.ld_flags.extend (self.gcc_arch_flags)
 
 		self.env.set ('CC',  'gcc-4.2')
 		self.env.set ('CXX', 'g++-4.2')
diff --git a/build/bundle/bockbuild/unixprofile.py b/build/bundle/bockbuild/unixprofile.py
index 83fa166..0114bf6 100644
--- a/build/bundle/bockbuild/unixprofile.py
+++ b/build/bundle/bockbuild/unixprofile.py
@@ -5,25 +5,21 @@ class UnixProfile (Profile):
 		Profile.__init__ (self)
 		self.name = 'unix'
 
-		self.gcc_arch_flags = [ '-m32', '-arch i386' ]
 		self.gcc_flags = [ '-I%{prefix}/include' ]
+		self.ld_flags = [ '-I%{prefix}/lib' ]
 
 		self.env.set ('PATH', ':',
 			'%{prefix}/bin',
 			'/usr/bin',
 			'/bin')
-		
-		self.env.set ('CFLAGS', ' ',
-			'%{gcc_flags}', 
-			'%{gcc_arch_flags}')
+
+		self.env.set ('CFLAGS',          '%{gcc_flags}')
 		self.env.set ('CXXFLAGS',        '%{env.CFLAGS}')
 		self.env.set ('CPPFLAGS',        '%{env.CFLAGS}')
 		self.env.set ('C_INCLUDE_PATH',  '%{prefix}/include')
 
 		self.env.set ('LD_LIBRARY_PATH', '%{prefix}/lib')
-		self.env.set ('LDFLAGS', ' ',
-			'-L%{prefix}/lib', 
-			'%{gcc_arch_flags}')
+		self.env.set ('LDFLAGS',         '%{ld_flags}')
 
 		self.env.set ('ACLOCAL_FLAGS',   '-I%{prefix}/share/aclocal')
 		self.env.set ('PKG_CONFIG_PATH', ':',



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]