fix: delegate lld discovery to rustc (#4269)

Author: sxyazi

.cargo/release.toml

@@ -1,16 +1,20 @@
+[unstable]
+trim-paths = true
+
 [profile.release]
 trim-paths = "all"
 
 [target.'cfg(all())']
 rustflags = [
 	"-Cpasses=mergefunc",
+	"-Zunstable-options",
 	"-Zshare-generics=true",
 ]
 
 # LLD lacks the SPARC GOTDATA_OP relocations emitted by GCC.
 [target.'cfg(all(target_os = "linux", not(target_arch = "sparc64")))']
 rustflags = [
-	"-Clink-arg=-fuse-ld=lld",
+	"-Clinker-features=+lld",
 	"-Clink-arg=-Wl,--icf=safe",
 	"-Clink-arg=-Wl,-z,pack-relative-relocs",
 ]

yazi-build/src/build.rs

@@ -1,9 +1,8 @@
-use std::{env, fs, iter, path::{Path, PathBuf}, process::Command};
+use std::{env::{self, consts::EXE_SUFFIX}, path::PathBuf, process::Command};
 
 use anyhow::{Context, Result, ensure};
-use yazi_macro::ok_or_not_found;
 
-use super::{cargo, is_linux_target, is_sparc64_target, is_windows_target, run, workspace_root};
+use super::{cargo, is_linux_target, is_sparc64_target, is_windows_target, run};
 
 pub(super) struct Build {
 	pub(super) target: String,
@@ -25,18 +24,21 @@ impl Build {
 		cmd
 			.env("RUSTC_BOOTSTRAP", "1")
 			.env("CARGO_TARGET_DIR", "target")
-			.args(["-Z", "trim-paths", "--config", ".cargo/release.toml", "build", "--locked"])
+			.args(["--config", ".cargo/release.toml", "build", "--locked"])
 			.args(["--profile", self.profile()]);
 
 		if !self.target.is_empty() {
 			cmd.arg("--target").arg(&self.target);
 		}
+		if is_linux_target(&self.target) && !is_sparc64_target(&self.target) && Self::has_rust_lld()? {
+			cmd.args([
+				"--config",
+				r#"target.'cfg(target_os = "linux")'.rustflags=["-Clink-self-contained=+linker"]"#,
+			]);
+		}
 		if self.completions {
 			cmd.env("YAZI_GEN_COMPLETIONS", "1");
 		}
-		if is_linux_target(&self.target) && !is_sparc64_target(&self.target) {
-			self.expose_lld(&mut cmd)?;
-		}
 
 		run(&mut cmd).context("failed to build Yazi")
 	}
@@ -45,53 +47,23 @@ impl Build {
 		if is_windows_target(&self.target) { "release-windows" } else { "release" }
 	}
 
-	fn expose_lld(&self, cmd: &mut Command) -> Result<()> {
-		let rust_lld = Self::rustc_libdir()?
-			.parent()
-			.context("Rust target libdir has no parent")?
-			.join("bin/rust-lld");
-		ensure!(rust_lld.is_file(), "{} does not exist", rust_lld.display());
-
-		let temp_dir = workspace_root()?.join("target/.rust-lld");
-		fs::create_dir_all(&temp_dir).context("failed to create `target/.rust-lld` directory")?;
-		for name in ["ld.lld".to_owned()].into_iter().chain(self.lld_alias()) {
-			let link = temp_dir.join(name);
-			ok_or_not_found!(fs::remove_file(&link));
-			#[cfg(unix)]
-			std::os::unix::fs::symlink(&rust_lld, link)?;
-			#[cfg(not(unix))]
-			anyhow::bail!("bundled rust-lld setup requires a Unix host");
-		}
-
-		let path = env::var_os("PATH").unwrap_or_default();
-		cmd.env("PATH", env::join_paths(iter::once(temp_dir).chain(env::split_paths(&path)))?);
-		Ok(())
-	}
-
-	fn rustc_libdir() -> Result<PathBuf> {
+	fn has_rust_lld() -> Result<bool> {
 		let output = Command::new(env::var_os("RUSTC").unwrap_or_else(|| "rustc".into()))
 			.args(["--print", "target-libdir"])
 			.output()
 			.context("failed to locate the Rust target libdir")?;
-
 		ensure!(output.status.success(), "`rustc --print target-libdir` failed");
-		Ok(String::from_utf8(output.stdout)?.trim().into())
-	}
 
-	// Cross GCC resolves `-fuse-ld=lld` as `<toolchain-prefix>ld.lld`.
-	// For example:
-	//   `aarch64-linux-musl-gcc.sh` => `aarch64-linux-musl-ld.lld`
-	// if Cargo has no configured linker:
-	//   `CROSS_TOOLCHAIN_PREFIX=x86_64-linux-musl-` => `x86_64-linux-musl-ld.lld`
-	fn lld_alias(&self) -> Option<String> {
-		let var = env::var_os(format!(
-			"CARGO_TARGET_{}_LINKER",
-			self.target.replace('-', "_").to_ascii_uppercase()
-		))
-		.or_else(|| env::var_os("CROSS_TOOLCHAIN_PREFIX"))?;
-
-		let prefix = Path::new(&var).file_stem()?.to_str()?.trim_end_matches("gcc");
+		let libdir: PathBuf = String::from_utf8(output.stdout)
+			.context("rustc returned an invalid target libdir")?
+			.trim()
+			.into();
+		let rust_lld = libdir
+			.parent()
+			.context("Rust target libdir has no parent")?
+			.join("bin")
+			.join(format!("rust-lld{EXE_SUFFIX}"));
 
-		Some(format!("{prefix}ld.lld"))
+		Ok(rust_lld.is_file())
 	}
 }

yazi-config/src/keymap/key.rs

@@ -54,7 +54,7 @@ impl FromStr for Key {
 		let mut key = Self::default();
 		if !s.starts_with('<') || !s.ends_with('>') {
 			key.code = KeyCode::Char(s.chars().next().unwrap());
-			key.shift = matches!(key.code, KeyCode::Char(c) if c.is_ascii_uppercase());
+			key.shift = matches!(key.code, KeyCode::Char(c) if c.is_uppercase());
 			return Ok(key);
 		}
 
@@ -104,7 +104,7 @@ impl FromStr for Key {
 				_ => match next {
 					s if it.peek().is_none() => {
 						let c = s.chars().next().unwrap();
-						key.shift |= c.is_ascii_uppercase();
+						key.shift |= c.is_uppercase();
 						key.code = KeyCode::Char(if key.shift { c.to_ascii_uppercase() } else { c });
 					}
 					s => bail!("unknown key: {s}"),