imprv

Author: ZuseZ4

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

@@ -2217,31 +2217,40 @@ impl Step for Assemble {
         }
 
         if builder.config.llvm_offload && !builder.config.dry_run() {
+            debug!("`llvm_offload` requested");
             let offload_install = builder.ensure(llvm::OmpOffload { target: build_compiler.host });
             if let Some(llvm_config) = builder.llvm_config(builder.config.host_target) {
                 let src_dir = offload_install.join("lib");
+                let libdir = builder.sysroot_target_libdir(build_compiler, build_compiler.host);
                 let target_libdir =
                     builder.sysroot_target_libdir(target_compiler, target_compiler.host);
                 let llvm = llvm::get_llvm_version(builder, &llvm_config);
                 let llvm_version = llvm.split('.').take(2).collect::<Vec<_>>().join(".");
-                let rust_version = builder.rust_version();
+                //let rust_version = builder.rust_version();
                 // e.g. libLLVMOffload.so.21.1
                 let lib_ext = std::env::consts::DLL_EXTENSION;
-                let libenzyme = format!("libLLVMOffload.{lib_ext}.{llvm_version}");
-                dbg!(&libenzyme);
-                let dst_lib = libdir.join(&libenzyme).with_extension(lib_ext);
-                let target_dst_lib = target_libdir.join(&libenzyme).with_extension(lib_ext);
-                let src_lib = src_dir.join(&libenzyme);
+                let liboffload = format!("libLLVMOffload.{lib_ext}.{llvm_version}");
+                dbg!(&liboffload);
+                let dst_lib = libdir.join(&liboffload);
+                let target_dst_lib = target_libdir.join(&liboffload);
+                let src_lib = src_dir.join(&liboffload);
+                dbg!(&src_lib);
+                dbg!(&dst_lib);
+                dbg!(&target_dst_lib);
                 builder.copy_link(&src_lib, &dst_lib, FileType::NativeLibrary);
                 builder.copy_link(&src_lib, &target_dst_lib, FileType::NativeLibrary);
 
                 // libomp.so, libomptarget.so
                 let omp = src_dir.join("libomp").with_extension(lib_ext);
                 let tgt = src_dir.join("libomptarget").with_extension(lib_ext);
-                builder.copy_link(&omp, &dst_lib, FileType::NativeLibrary);
-                builder.copy_link(&omp, &dst_lib, FileType::NativeLibrary);
-                builder.copy_link(&tgt, &dst_lib, FileType::NativeLibrary);
-                builder.copy_link(&tgt, &dst_lib, FileType::NativeLibrary);
+                let dst_omp_lib = libdir.join(&omp);
+                let target_dst_omp_lib = target_libdir.join(&omp);
+                let dst_tgt_lib = libdir.join(&tgt);
+                let target_dst_tgt_lib = target_libdir.join(&tgt);
+                builder.copy_link(&omp, &dst_omp_lib, FileType::NativeLibrary);
+                builder.copy_link(&omp, &target_dst_omp_lib, FileType::NativeLibrary);
+                builder.copy_link(&tgt, &dst_tgt_lib, FileType::NativeLibrary);
+                builder.copy_link(&tgt, &target_dst_tgt_lib, FileType::NativeLibrary);
                 //[\u@\h:\W]$ ls ../offload-outdir/lib
                 // amdgcn-amd-amdhsa  libarcher.so        libgomp.so    libiomp5.so	libLLVMOffload.so.21.1	libomp.so	 libomptarget.so.21.1
                 // cmake		   libarcher_static.a  libgomp.so.1  libLLVMOffload.so	libompd.so		libomptarget.so  nvptx64-nvidia-cuda