Skip to content

Commit 1a36626

Browse files
authored
fix macos builds (#168)
1 parent 4f40cad commit 1a36626

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,25 +1776,25 @@ impl Step for Assemble {
17761776
// use that to bootstrap this compiler forward.
17771777
let mut build_compiler = builder.compiler(target_compiler.stage - 1, builder.config.build);
17781778

1779-
17801779
// Build enzyme
1781-
let enzyme_install =
1782-
Some(builder.ensure(llvm::Enzyme { target: build_compiler.host }));
1783-
//let enzyme_install = if builder.config.llvm_enzyme {
1784-
// Some(builder.ensure(llvm::Enzyme { target: build_compiler.host }))
1785-
//} else {
1786-
// None
1787-
//};
1780+
let enzyme_install = if builder.config.llvm_enzyme {
1781+
Some(builder.ensure(llvm::Enzyme { target: build_compiler.host }))
1782+
} else {
1783+
None
1784+
};
17881785

17891786
if let Some(enzyme_install) = enzyme_install {
1790-
let src_lib = enzyme_install.join("build/Enzyme/LLVMEnzyme-19.so");
1787+
let lib_ext = match env::consts::OS {
1788+
"macos" => "dylib",
1789+
"windows" => "dll",
1790+
_ => "so",
1791+
};
17911792

1793+
let src_lib = enzyme_install.join("build/Enzyme/libEnzyme-19").with_extension(lib_ext);
17921794
let libdir = builder.sysroot_libdir(build_compiler, build_compiler.host);
17931795
let target_libdir = builder.sysroot_libdir(target_compiler, target_compiler.host);
1794-
let dst_lib = libdir.join("libLLVMEnzyme-19.so");
1795-
let target_dst_lib = target_libdir.join("libLLVMEnzyme-19.so");
1796-
//builder.copy_extra_objects(builder, &compiler, target);
1797-
//builder.copy_extra_objects(builder, &compiler, target);
1796+
let dst_lib = libdir.join("libEnzyme-19").with_extension(lib_ext);
1797+
let target_dst_lib = target_libdir.join("libEnzyme-19").with_extension(lib_ext);
17981798
builder.copy_link(&src_lib, &dst_lib);
17991799
builder.copy_link(&src_lib, &target_dst_lib);
18001800
}

src/bootstrap/src/core/build_steps/llvm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ impl Step for Enzyme {
911911
.profile(profile)
912912
.env("LLVM_CONFIG_REAL", &llvm_config)
913913
.define("LLVM_ENABLE_ASSERTIONS", "ON")
914-
.define("ENZYME_EXTERNAL_SHARED_LIB", "OFF")
914+
.define("ENZYME_EXTERNAL_SHARED_LIB", "ON")
915915
.define("LLVM_DIR", builder.llvm_out(target));
916916

917917
cfg.build();

src/bootstrap/src/core/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ impl<'a> Builder<'a> {
15851585

15861586
// https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/.E2.9C.94.20link.20new.20library.20into.20stage1.2Frustc
15871587
rustflags.arg("-l");
1588-
rustflags.arg("LLVMEnzyme-19");
1588+
rustflags.arg("Enzyme-19");
15891589

15901590
let use_new_symbol_mangling = match self.config.rust_new_symbol_mangling {
15911591
Some(setting) => {

0 commit comments

Comments
 (0)