diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-21 06:16:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-21 06:16:13 -0500 |
| commit | 236c687b66ff47f68b4d469db6bc35cdf415fcbf (patch) | |
| tree | 5c93ad451ca3e2a2f8c9772d1d2a8adeaee592ef | |
| parent | 821797d6f7728b512ffd8f59053f9040744e2c53 (diff) | |
| parent | 93866d42edee10282ccac6975573b5ff6ccbbc39 (diff) | |
| download | servo-236c687b66ff47f68b4d469db6bc35cdf415fcbf.tar.gz servo-236c687b66ff47f68b4d469db6bc35cdf415fcbf.zip | |
Auto merge of #13349 - saneyuki:update-mozjs-to-fix-build-on-sierra, r=Ms2ger
Update mozjs_sys to fix the build failure on macOS Sierra
- https://github.com/servo/servo/issues/13348
- This only fixes the failure to compile mozjs_sys. Linking problem with xcode 8 is still opened (https://github.com/servo/servo/issues/11846)
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13349)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index e3b03e9f8bb..3b91d9771c7 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1392,7 +1392,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#87c47526cfe64c1ccfb98daaaa14f63de6295be4" +source = "git+https://github.com/servo/mozjs#cdf21f7c5596cb6e02eb9afdfc51841deea84a1f" dependencies = [ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 6c5f8cd1394..ac0e479c726 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#87c47526cfe64c1ccfb98daaaa14f63de6295be4" +source = "git+https://github.com/servo/mozjs#cdf21f7c5596cb6e02eb9afdfc51841deea84a1f" dependencies = [ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", |