Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion jemalloc-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,10 @@ fn make_command(make_cmd: &str, build_dir: &Path, num_jobs: &str) -> Command {

if let Ok(makeflags) = std::env::var("CARGO_MAKEFLAGS") {
let makeflags = if let Ok(orig_makeflags) = std::env::var("MAKEFLAGS") {
format!("{orig_makeflags} {makeflags}")
// Prepend Cargo makeflags before externally configured makeflags
// Adding Cargo makeflags at the end was causing issues, see
// https://github.com/tikv/jemallocator/issues/92#issuecomment-3536269176.
format!("{makeflags} {orig_makeflags}")
} else {
makeflags
};
Expand Down
Loading