test

Author: ZuseZ4

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

@@ -1192,12 +1192,11 @@ pub fn rustc_cargo(
     if builder.config.llvm_enzyme {
         let arch = builder.build.build;
         let enzyme_dir = builder.build.out.join(arch).join("enzyme").join("lib");
-        let abs_path = enzyme_dir.join("libEnzymeStatic-20.a");
+        //cargo.rustflag("-L").rustflag(enzyme_dir.to_str().expect("Invalid path"));
 
         if let Some(llvm_config) = builder.llvm_config(builder.config.build) {
-            //let llvm_version_major = llvm::get_llvm_version_major(builder, &llvm_config);
-            //cargo.rustflag("-l").rustflag(&format!("EnzymeStatic-{llvm_version_major}"));
-            cargo.rustflag(abs_path.to_str().unwrap());
+            let llvm_version_major = llvm::get_llvm_version_major(builder, &llvm_config);
+            cargo.rustflag("-l").rustflag(&format!("Enzyme-{llvm_version_major}"));
         }
     }
 
@@ -2070,8 +2069,8 @@ impl Step for Assemble {
             let enzyme_install = builder.ensure(llvm::Enzyme { target: build_compiler.host });
             let llvm_config = builder.llvm_config(builder.config.build).unwrap();
             let llvm_version_major = llvm::get_llvm_version_major(builder, &llvm_config);
-            let lib_ext = "a";
-            let libenzyme = format!("libEnzymeStatic-{llvm_version_major}");
+            let lib_ext = "so";
+            let libenzyme = format!("libEnzyme-{llvm_version_major}");
             let src_lib =
                 enzyme_install.join("build/Enzyme").join(&libenzyme).with_extension(lib_ext);
             let libdir = builder.sysroot_target_libdir(build_compiler, build_compiler.host);
@@ -2081,6 +2080,12 @@ impl Step for Assemble {
             let target_dst_lib = target_libdir.join(&libenzyme).with_extension(lib_ext);
             builder.copy_link(&src_lib, &dst_lib, FileType::NativeLibrary);
             builder.copy_link(&src_lib, &target_dst_lib, FileType::NativeLibrary);
+            //add_to_sysroot(
+            //    builder,
+            //    &src_lib,
+            //    &target_dst_lib,
+            //    &build_stamp::librustc_stamp(builder, build_compiler, target_compiler.host),
+            //);
         }
 
         // Build the libraries for this compiler to link to (i.e., the libraries

src/bootstrap/src/core/builder/cargo.rs

@@ -995,7 +995,7 @@ impl Builder<'_> {
                     if self.config.llvm_enzyme {
                         let arch = self.build.build;
                         let enzyme_dir = self.build.out.join(arch).join("enzyme").join("lib");
-                        rustflags.arg(&format!("-Clink-arg=-L{enzyme_dir}"));
+                        rustflags.arg(&format!("-Clink-arg=-L{}", enzyme_dir.display()));
                     }
                 }
             }