diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 20:29:58 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 20:29:58 +0530 |
| commit | 7c4fd5e77078b523ae368f42c7d43c9d76acaf50 (patch) | |
| tree | b1c8891fbc879193011107f63a42727033a2fd62 | |
| parent | 7ace7bc09087b6bfa817047640ba15df997b4a91 (diff) | |
| parent | e0fd25414763980c4f6f44de927601bee2dbf455 (diff) | |
| download | servo-7c4fd5e77078b523ae368f42c7d43c9d76acaf50.tar.gz servo-7c4fd5e77078b523ae368f42c7d43c9d76acaf50.zip | |
Auto merge of #8387 - larsbergstrom:update_mozjs, r=Manishearth
Update mozjs
r? @Manishearth
This mainly just picks up the support for ccache. I'd like to get one module using it to land to see how it works on Travis & the builders (probably should have done this along with #8366).
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8387)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 9d78bf218e5..701aadc6d36 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1138,7 +1138,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#74e7e954f5445ca0297772d5df543c270339dec2" +source = "git+https://github.com/servo/mozjs#d5a1615370ccfaae35cc3bea0df46cbbb9e1ce1a" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index df8359dd612..819bc11730a 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1091,7 +1091,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#74e7e954f5445ca0297772d5df543c270339dec2" +source = "git+https://github.com/servo/mozjs#d5a1615370ccfaae35cc3bea0df46cbbb9e1ce1a" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 8d0ef988252..692d4b39388 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1071,7 +1071,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#74e7e954f5445ca0297772d5df543c270339dec2" +source = "git+https://github.com/servo/mozjs#d5a1615370ccfaae35cc3bea0df46cbbb9e1ce1a" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", |