diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-10-14 15:26:51 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-10-14 15:26:51 -0600 |
| commit | 35d1b13b724a751dbbc795e8b25570306c019f06 (patch) | |
| tree | debdf70da1c286741374a29d9d236bf847821912 | |
| parent | b34fd5bd7e55be1d577df5cf70b41af8a6cc716b (diff) | |
| parent | 55783e87272d43abadacaed87bc54c2d50ca28ab (diff) | |
| download | servo-35d1b13b724a751dbbc795e8b25570306c019f06.tar.gz servo-35d1b13b724a751dbbc795e8b25570306c019f06.zip | |
Auto merge of #7993 - connorimes:energymon-arm-updates, r=larsbergstrom
Update energymon-sys and energymon-default-sys versions
Includes build script updates to support Rust linking to static libs on ARM systems as well as some changes to ODROID Smart Power and RAPL energymon implementations.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7993)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f261fed2a06..20c56d42776 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -484,7 +484,7 @@ dependencies = [ [[package]] name = "energymon-default-sys" version = "0.1.0" -source = "git+https://github.com/energymon/energymon-default-sys.git#902e57f2011371309a0e1ea798e21055e40258a1" +source = "git+https://github.com/energymon/energymon-default-sys.git#82dd2f6762b492ced15d8446b70569778200c287" dependencies = [ "energymon-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -494,7 +494,7 @@ dependencies = [ [[package]] name = "energymon-sys" version = "0.1.0" -source = "git+https://github.com/energymon/energymon-sys.git#770d2cfe0373cf833992352b50dfdceb7a42b2e6" +source = "git+https://github.com/energymon/energymon-sys.git#6306f70e5d5c824fa168e43521385798fd1b890b" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] |