Skip to content

Commit 1f7e22c

Browse files
committed
add enzyme in build-manifest
1 parent 8fe2ec3 commit 1f7e22c

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

src/bootstrap/src/core/build_steps/dist.rs

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,28 +2605,11 @@ impl Step for Enzyme {
26052605
}
26062606

26072607
fn run(self, builder: &Builder<'_>) -> Self::Output {
2608-
let tarball = Tarball::new(builder, "enzyme", &self.target.triple);
2608+
let mut tarball = Tarball::new(builder, "enzyme", &self.target.triple);
26092609
let output = builder.ensure(super::llvm::Enzyme { target: self.target });
2610-
tarball.add_file(
2611-
output.join("lib").join("libEnzyme-20.so"),
2612-
"lib",
2613-
FileType::NativeLibrary,
2614-
);
2615-
let cmake_dir = output.join("lib").join("cmake").join("Enzyme");
2616-
let cmake_files = [
2617-
"EnzymeConfig.cmake",
2618-
"EnzymeConfigVersion.cmake",
2619-
"EnzymeTargets-release.cmake",
2620-
"EnzymeTargets.cmake",
2621-
];
2622-
for file in &cmake_files {
2623-
tarball.add_file(
2624-
cmake_dir.join(file),
2625-
Path::new("lib").join("cmake").join("Enzyme"),
2626-
FileType::Regular,
2627-
);
2628-
}
2629-
2610+
tarball.add_dir(output.join("include"), "include");
2611+
tarball.add_file(output.join("lib").join("libEnzyme-20.so"), ".", FileType::NativeLibrary);
2612+
tarball.is_preview(true);
26302613
tarball.generate()
26312614
}
26322615
}

src/tools/build-manifest/src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,8 @@ impl Builder {
480480
| PkgType::RustAnalysis
481481
| PkgType::JsonDocs
482482
| PkgType::RustcCodegenCranelift
483-
| PkgType::LlvmBitcodeLinker => {
483+
| PkgType::LlvmBitcodeLinker
484+
| PkgType::Enzyme => {
484485
extensions.push(host_component(pkg));
485486
}
486487
PkgType::RustcDev | PkgType::RustcDocs => {

src/tools/build-manifest/src/versions.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pkg_type! {
5959
JsonDocs = "rust-docs-json"; preview = true,
6060
RustcCodegenCranelift = "rustc-codegen-cranelift"; preview = true,
6161
LlvmBitcodeLinker = "llvm-bitcode-linker"; preview = true,
62+
Enzyme = "enzyme"; preview = true
6263
}
6364

6465
impl PkgType {
@@ -82,6 +83,7 @@ impl PkgType {
8283
PkgType::LlvmTools => false,
8384
PkgType::Miri => false,
8485
PkgType::RustcCodegenCranelift => false,
86+
PkgType::Enzyme => false,
8587

8688
PkgType::Rust => true,
8789
PkgType::RustStd => true,
@@ -123,6 +125,7 @@ impl PkgType {
123125
RustAnalysis => TARGETS,
124126
LlvmTools => TARGETS,
125127
LlvmBitcodeLinker => HOSTS,
128+
Enzyme => TARGETS,
126129
}
127130
}
128131

0 commit comments

Comments
 (0)