Skip to content

Commit

Permalink
Auto merge of rust-lang#75838 - mati865:profiler-atomics, r=Amanieu
Browse files Browse the repository at this point in the history
Profiler: reenable atomics after rust-lang#65214
  • Loading branch information
bors committed Aug 25, 2020
2 parents c35007d + 1a9def1 commit 5890563
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/profiler_builtins/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fn main() {
// This should be a pretty good heuristic for when to set
// COMPILER_RT_HAS_ATOMICS
if env::var_os("CARGO_CFG_TARGET_HAS_ATOMIC")
.map(|features| features.to_string_lossy().to_lowercase().contains("cas"))
.map(|features| features.to_string_lossy().to_lowercase().contains("ptr"))
.unwrap_or(false)
{
cfg.define("COMPILER_RT_HAS_ATOMICS", Some("1"));
Expand Down

0 comments on commit 5890563

Please sign in to comment.