diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2013-06-28 01:13:39 +0400 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2013-06-28 01:13:39 +0400 |
| commit | fafc5fdebb32cee8f213bfaa5759b735ad166e5c (patch) | |
| tree | 4dcc0ccc24e981098f24bf5ee21049f5c22bce3d | |
| parent | d8d7a433447185d4b790b31b34d2ba2550652b2f (diff) | |
Rework the mono build to be ccache friendly. Add BOCKBUILD_USE_CCACHE env var to enable it.mono-with-ccache
| -rw-r--r-- | bockbuild/darwinprofile.py | 13 | ||||
| -rw-r--r-- | bockbuild/unixprofile.py | 1 | ||||
| -rw-r--r-- | packages/mono-llvm.py | 2 | ||||
| -rw-r--r-- | packages/mono-master.py | 1 |
4 files changed, 9 insertions, 8 deletions
diff --git a/bockbuild/darwinprofile.py b/bockbuild/darwinprofile.py index 54e2f05..2e17ff9 100644 --- a/bockbuild/darwinprofile.py +++ b/bockbuild/darwinprofile.py @@ -35,25 +35,26 @@ class DarwinProfile (UnixProfile): else: raise IOError ('Mac OS X SDKs 10.6 and 10.7 not found') - self.gcc_arch_flags = [ '-m32', '-arch i386' ] self.gcc_debug_flags = [ '-O0', '-ggdb3' ] if self.cmd_options.debug is True: self.gcc_flags.extend (self.gcc_debug_flags) - self.gcc_flags.extend (self.gcc_arch_flags) - self.ld_flags.extend (self.gcc_arch_flags) - #if (os.path.isfile ('/usr/bin/gcc-4.2')): # self.env.set ('CC', 'gcc-4.2') # self.env.set ('CXX', 'g++-4.2') #else: - self.env.set ('CC', 'gcc') - self.env.set ('CXX', 'g++') + if os.getenv('BOCKBUILD_USE_CCACHE') is None: + self.env.set ('CC', 'gcc') + self.env.set ('CXX', 'g++') + else: + self.env.set ('CC', 'ccache gcc') + self.env.set ('CXX', 'ccache g++') # GTK2_RC_FILES must be a ":"-seperated list of files (NOT a single folder) self.gtk2_rc_files = os.path.join (os.getcwd (), 'skeleton.darwin', 'Contents', 'Resources', 'etc', 'gtk-2.0', 'gtkrc') self.env.set ('GTK2_RC_FILES', '%{gtk2_rc_files}') + self.global_configure_flags.extend (['--build=i386-apple-darwin10.8.0']) def bundle (self): self.make_app_bundle () diff --git a/bockbuild/unixprofile.py b/bockbuild/unixprofile.py index 83621bc..cb29f07 100644 --- a/bockbuild/unixprofile.py +++ b/bockbuild/unixprofile.py @@ -22,6 +22,7 @@ class UnixProfile (Profile): '%{prefix}/bin', '/usr/bin', '/bin', + '/usr/local/bin', '/usr/local/git/bin') self.env.set ('CFLAGS', '%{gcc_flags}') diff --git a/packages/mono-llvm.py b/packages/mono-llvm.py index 853ba49..f65fb07 100644 --- a/packages/mono-llvm.py +++ b/packages/mono-llvm.py @@ -1,4 +1,4 @@ GitHubPackage ('mono', 'llvm', '3.0', revision = 'f88c8bf5b31996435ed04b530cb4c7f02b244372', - configure_flags = ['--enable-optimized', '--enable-targets="x86 x86_64"', '--build=i386-apple-darwin10.8.0'] + configure_flags = ['--enable-optimized', '--enable-targets="x86 x86_64"'] ) diff --git a/packages/mono-master.py b/packages/mono-master.py index 963fc04..c9eb21e 100644 --- a/packages/mono-master.py +++ b/packages/mono-master.py @@ -16,7 +16,6 @@ class MonoMasterPackage(Package): if Package.profile.name == 'darwin': self.configure_flags.extend([ # fix build on lion, it uses 64-bit host even with -m32 - '--build=i386-apple-darwin11.2.0', '--enable-loadedllvm' ]) |