mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
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 -->
This commit is contained in:
commit
35d1b13b72
1 changed files with 2 additions and 2 deletions
4
components/servo/Cargo.lock
generated
4
components/servo/Cargo.lock
generated
|
@ -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)",
|
||||
]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue