diff options
| author | Jonas Schievink <[email protected]> | 2020-08-12 11:31:17 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-12 11:31:17 +0100 |
| commit | b27d5233bb3d68ae27e97879c85e5a8851d0501e (patch) | |
| tree | 0e905210a9e04cd6b8a2f8a09d724ce7cc9ed6f5 /crates | |
| parent | 87429768bd6cbe73a818e73ac1aaee65a8b59ec5 (diff) | |
| parent | 67b2b3d0ce59fe082b442de30627c3386048eaca (diff) | |
Merge pull request #5716 from jonas-schievink/musl
Fix build on musl and test it in CI
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/ra_prof/src/memory_usage.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs index c2ecbd33c..83390212a 100644 --- a/crates/ra_prof/src/memory_usage.rs +++ b/crates/ra_prof/src/memory_usage.rs | |||
| @@ -24,7 +24,7 @@ impl std::ops::Sub for MemoryUsage { | |||
| 24 | impl MemoryUsage { | 24 | impl MemoryUsage { |
| 25 | pub fn current() -> MemoryUsage { | 25 | pub fn current() -> MemoryUsage { |
| 26 | cfg_if! { | 26 | cfg_if! { |
| 27 | if #[cfg(target_os = "linux")] { | 27 | if #[cfg(all(target_os = "linux", target_env = "gnu"))] { |
| 28 | // Note: This is incredibly slow. | 28 | // Note: This is incredibly slow. |
| 29 | let alloc = unsafe { libc::mallinfo() }.uordblks as isize; | 29 | let alloc = unsafe { libc::mallinfo() }.uordblks as isize; |
| 30 | MemoryUsage { allocated: Bytes(alloc) } | 30 | MemoryUsage { allocated: Bytes(alloc) } |