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
13 changes: 8 additions & 5 deletions src/bootstrap/src/core/build_steps/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -557,11 +557,14 @@ impl CommandLineStep for Llvm {
// which saves both memory during parallel links and overall disk space
// for the tools. We don't do this on every platform as it doesn't work
// equally well everywhere.
if link_shared {
cfg.define("LLVM_LINK_LLVM_DYLIB", "ON");
// Keep the pre-LLVM23 behavior for now.
cfg.define("LLVM_VERSIONED_DYLIB_NAME_ON_DARWIN", "OFF");
}
//
// Under normal circumstances, the dylib LINK and BUILD vars below should
// be set to the same value. See #160597
let llvm_dylib = if link_shared { "ON" } else { "OFF" };
cfg.define("LLVM_LINK_LLVM_DYLIB", llvm_dylib);
cfg.define("LLVM_BUILD_LLVM_DYLIB", llvm_dylib);
// Keep the pre-LLVM23 behavior for now.
cfg.define("LLVM_VERSIONED_DYLIB_NAME_ON_DARWIN", "OFF");

if (target.starts_with("csky")
|| target.starts_with("riscv")
Expand Down
Loading