[bockbuild] Avoid overwriting self.local_configure_flags in some packages, extend...

diff --git a/packaging/MacSDK/mono-llvm.py b/packaging/MacSDK/mono-llvm.py
index cf9e89ba9bdd54790931017e18a2062b90b4cd63..bcb1e7501a51e202d1e488e6c7c990a532b50ba9 100644 (file)
--- a/packaging/MacSDK/mono-llvm.py
+++ b/packaging/MacSDK/mono-llvm.py
@@ -21,11 +21,12 @@ class MonoLlvmPackage (GitHubPackage):
         self.cpp_flags = []
 
     def arch_build(self, arch):
+        Package.profile.arch_build(arch, self)
         if arch == 'darwin-64':  # 64-bit  build pass
-            self.local_configure_flags = ['--build=x86_64-apple-darwin11.2.0']
+            self.local_configure_flags.extend(['--build=x86_64-apple-darwin11.2.0'])
 
         if arch == 'darwin-32':
-            self.local_configure_flags = ['--build=i386-apple-darwin11.2.0']
+            self.local_configure_flags.extend(['--build=i386-apple-darwin11.2.0'])
 
         # LLVM says that libstdc++4.6 is broken and we should use libstdc++4.7.
         # This switches it to the right libstdc++.

diff --git a/packaging/MacSDK/mono.py b/packaging/MacSDK/mono.py
index 34f7afe3107adc49b5e64a6826bf9dbba2b59bdd..bbbf8db091da50b49b87fdc1cc623695e46cdb4a 100644 (file)
--- a/packaging/MacSDK/mono.py
+++ b/packaging/MacSDK/mono.py
@@ -63,13 +63,12 @@ class MonoMasterPackage(Package):
             self.sh('patch -p1 < "%{local_sources[' + str(p) + ']}"')
 
     def arch_build(self, arch):
+        Package.profile.arch_build(arch, self)
         if arch == 'darwin-64':  # 64-bit build pass
-            self.local_gcc_flags = ['-m64']
-            self.local_configure_flags = ['--build=x86_64-apple-darwin11.2.0', '--disable-boehm']
+            self.local_configure_flags.extend (['--build=x86_64-apple-darwin11.2.0', '--disable-boehm'])
 
         if arch == 'darwin-32':  # 32-bit build pass
-            self.local_gcc_flags = ['-m32']
-            self.local_configure_flags = ['--build=i386-apple-darwin11.2.0']
+            self.local_configure_flags.extend (['--build=i386-apple-darwin11.2.0'])
 
         self.local_configure_flags.extend(
             ['--cache-file=%s/%s-%s.cache' % (self.profile.bockbuild.build_root, self.name, arch)])