Skip to content

Commit b664bb5

Browse files
committed
try static build and absolute path
1 parent 83ffdd3 commit b664bb5

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,11 +1192,12 @@ pub fn rustc_cargo(
11921192
if builder.config.llvm_enzyme {
11931193
let arch = builder.build.build;
11941194
let enzyme_dir = builder.build.out.join(arch).join("enzyme").join("lib");
1195-
cargo.rustflag("-L").rustflag(enzyme_dir.to_str().expect("Invalid path"));
1195+
let abs_path = enzyme_dir.join("libEnzymeStatic-20.a");
11961196

11971197
if let Some(llvm_config) = builder.llvm_config(builder.config.build) {
1198-
let llvm_version_major = llvm::get_llvm_version_major(builder, &llvm_config);
1199-
cargo.rustflag("-l").rustflag(&format!("Enzyme-{llvm_version_major}"));
1198+
//let llvm_version_major = llvm::get_llvm_version_major(builder, &llvm_config);
1199+
//cargo.rustflag("-l").rustflag(&format!("EnzymeStatic-{llvm_version_major}"));
1200+
cargo.rustflag(abs_path);
12001201
}
12011202
}
12021203

@@ -2069,8 +2070,8 @@ impl Step for Assemble {
20692070
let enzyme_install = builder.ensure(llvm::Enzyme { target: build_compiler.host });
20702071
let llvm_config = builder.llvm_config(builder.config.build).unwrap();
20712072
let llvm_version_major = llvm::get_llvm_version_major(builder, &llvm_config);
2072-
let lib_ext = std::env::consts::DLL_EXTENSION;
2073-
let libenzyme = format!("libEnzyme-{llvm_version_major}");
2073+
let lib_ext = "a";
2074+
let libenzyme = format!("libEnzymeStatic-{llvm_version_major}");
20742075
let src_lib =
20752076
enzyme_install.join("build/Enzyme").join(&libenzyme).with_extension(lib_ext);
20762077
let libdir = builder.sysroot_target_libdir(build_compiler, build_compiler.host);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,7 @@ impl Step for Enzyme {
981981
.env("LLVM_CONFIG_REAL", &llvm_config)
982982
.define("LLVM_ENABLE_ASSERTIONS", "ON")
983983
.define("ENZYME_EXTERNAL_SHARED_LIB", "ON")
984+
.define("ENZYME_STATIC_LIB", "ON")
984985
.define("LLVM_DIR", builder.llvm_out(target).join("build"));
985986

986987
cfg.build();

0 commit comments

Comments
 (0)