Skip to content

Commit

Permalink
Auto merge of rust-lang#112049 - Kobzol:pgo-omit-benchmarks, r=<try>
Browse files Browse the repository at this point in the history
[do not merge] CI experiments

Various CI experiments for try/dist builds.

r? `@ghost`
  • Loading branch information
bors committed Jan 5, 2025
2 parents dcfa38f + 295c30d commit 7aa173f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stable_mir = { path = "../stable_mir" }
[dependencies.tikv-jemalloc-sys]
version = "0.6.0"
optional = true
features = ['unprefixed_malloc_on_supported_platforms']
features = ['unprefixed_malloc_on_supported_platforms', 'background_threads']

[features]
# tidy-alphabetical-start
Expand Down
6 changes: 6 additions & 0 deletions src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1207,6 +1207,12 @@ pub fn rustc_cargo_env(
rustc_llvm_env(builder, cargo, target)
}
}
if builder.config.jemalloc {
cargo.env(
"JEMALLOC_SYS_WITH_MALLOC_CONF",
"dirty_decay_ms:0,muzzy_decay_ms:0,abort_conf:true",
);
}
}

/// Pass down configuration from the LLVM build into the build of
Expand Down

0 comments on commit 7aa173f

Please sign in to comment.