Use lld instead of lld-link when using clang

rust-cross · Dec 23, 2024 · 2a1f5b5 · 2a1f5b5
1 parent fcc0f78
commit 2a1f5b5
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/compiler/clang.rs b/src/compiler/clang.rs
@@ -62,7 +62,7 @@ impl Clang {
                 let sysroot_dir =
                     adjust_canonicalization(msvc_sysroot_dir.to_slash_lossy().to_string());
                 let clang_flags = format!(
-                    "--target={target_no_vendor} -fuse-ld=lld-link -I{dir}/include -I{dir}/include/c++/stl -L{dir}/lib/{target_unknown_vendor}",
+                    "--target={target_no_vendor} -fuse-ld=lld -I{dir}/include -I{dir}/include/c++/stl -L{dir}/lib/{target_unknown_vendor}",
                     dir = sysroot_dir,
                 );
                 cmd.env(
@@ -84,8 +84,6 @@ impl Clang {
 
                 let mut rustflags = get_rustflags(&workdir, target)?.unwrap_or_default();
                 rustflags.flags.extend([
-                    "-C".to_string(),
-                    "linker-flavor=lld-link".to_string(),
                     "-C".to_string(),
                     "link-arg=-defaultlib:oldnames".to_string(),
                 ]);
@@ -263,18 +261,16 @@ set(CMAKE_SYSTEM_PROCESSOR {processor})
 
 set(CMAKE_C_COMPILER clang CACHE FILEPATH "")
 set(CMAKE_CXX_COMPILER clang++ CACHE FILEPATH "")
-set(CMAKE_LINKER lld-link CACHE FILEPATH "")
 set(CMAKE_RC_COMPILER llvm-rc CACHE FILEPATH "")
 
 set(COMPILE_FLAGS
     --target={target_no_vendor}
-    -fuse-ld=lld-link
+    -fuse-ld=lld
     -I{dir}/include
     -I{dir}/include/c++/stl)
 
 set(LINK_FLAGS
-    /manifest:no
-    -libpath:"{dir}/lib/{target_unknown_vendor}")
+    -L"{dir}/lib/{target_unknown_vendor}")
         "#,
             dir = sysroot_dir,
         );