language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 04:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fmt, clippy, nix aliases fix

Browse source
This commit is contained in:
Anton-4 2023-08-08 20:03:21 +02:00
parent 387b6927d5
commit ec3bcb33f6
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
4 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/compiler/build/src/link.rs
View file

@ -880,7 +880,7 @@ fn link_linux(
//env::var_os("NIX_GLIBC_PATH").map(|path| path.into_string().unwrap()),
//env::var_os("NIX_LIBGCC_S_PATH").map(|path| path.into_string().unwrap())
let nix_paths_vec_string = nix_paths();
let nix_paths_vec: Vec<PathBuf> = nix_paths_vec_string.iter().map(|path_string| PathBuf::from(path_string)).collect();
let nix_paths_vec: Vec<PathBuf> = nix_paths_vec_string.iter().map(PathBuf::from).collect();
let usr_lib_arch_path = strs_to_path(&["/usr", "lib", &architecture]);
let lib_arch_path = strs_to_path(&["/lib", &architecture]);
@ -891,7 +891,7 @@ fn link_linux(
lib_dirs.extend(nix_paths_vec)
}
lib_dirs.extend( [
lib_dirs.extend([
usr_lib_arch_path,
lib_arch_path,
strs_to_path(&["/usr", "lib"]),
@ -929,7 +929,13 @@ fn link_linux(
let dirs = lib_dirs
.iter()
.map(|path_buf| path_buf.as_path().to_str().unwrap_or("FAILED TO CONVERT PATH TO STR").to_string())
.map(|path_buf| {
path_buf
.as_path()
.to_str()
.unwrap_or("FAILED TO CONVERT PATH TO STR")
.to_string()
})
.collect::<Vec<String>>()
.join("\n");
eprintln!("We looked in the following directories:\n{dirs}");
@ -941,7 +947,10 @@ fn link_linux(
Architecture::X86_64 => {
// give preference to nix_path if it's defined, this prevents bugs
if let Some(nix_glibc_path) = nix_glibc_path_opt() {
build_path([&nix_glibc_path.into_string().unwrap(), "ld-linux-x86-64.so.2"])
build_path([
&nix_glibc_path.into_string().unwrap(),
"ld-linux-x86-64.so.2",
])
} else {
build_path(["/lib64", "ld-linux-x86-64.so.2"])
}