mirror of
https://github.com/servo/servo.git
synced 2025-06-10 17:43:16 +00:00
Auto merge of #8366 - larsbergstrom:ccache, r=frewsxcv
Add CCACHE infra and turn it on in travis r? @Manishearth This lets devs configure their use of CCACHE with their .servobuild file, as usual. For build environments, they can either have a .servobuild file or set the CCACHE env var to point at the ccache binary to use. It also adds support for ccache to our travis builds. Buildbot will come in a separate commit to the saltfs repo. It is expected that the various cargo makefiles will look at this variable and do the "right thing" to tell their native build to instead use ccache. e.g., https://github.com/servo/mozjs/pull/62 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8366) <!-- Reviewable:end -->
This commit is contained in:
commit
d16ba51b47
4 changed files with 9 additions and 0 deletions
|
@ -232,6 +232,9 @@ class MachCommands(CommandBase):
|
|||
env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")
|
||||
env['OPENSSL_STATIC'] = 'TRUE'
|
||||
|
||||
if not (self.config["build"]["ccache"] == ""):
|
||||
env['CCACHE'] = self.config["build"]["ccache"]
|
||||
|
||||
status = call(
|
||||
["cargo", "build"] + opts,
|
||||
env=env, cwd=self.servo_crate(), verbose=verbose)
|
||||
|
|
|
@ -107,6 +107,7 @@ class CommandBase(object):
|
|||
self.config["build"].setdefault("android", False)
|
||||
self.config["build"].setdefault("mode", "")
|
||||
self.config["build"].setdefault("debug-mozjs", False)
|
||||
self.config["build"].setdefault("ccache", "")
|
||||
|
||||
self.config.setdefault("android", {})
|
||||
self.config["android"].setdefault("sdk", "")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue