language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 23:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Pick correct version of architecture name

Browse source
This commit is contained in:
Brendan Hansknecht 2020-11-25 22:45:32 -08:00
parent 0c1491c182
commit 4d0363456a
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/build/src/link.rs
View file

@ -150,10 +150,9 @@ fn link_linux(
input_paths: &[&str], input_paths: &[&str],
link_type: LinkType, link_type: LinkType,
) -> io::Result<(Child, PathBuf)> { ) -> io::Result<(Child, PathBuf)> {
let arch = arch_str(target);
let usr_lib_path = Path::new("/usr/lib").to_path_buf(); let usr_lib_path = Path::new("/usr/lib").to_path_buf();
let usr_lib_gnu_path = usr_lib_path.join(format!("{}-linux-gnu", arch)); let usr_lib_gnu_path = usr_lib_path.join(format!("{}-linux-gnu", target.architecture));
let lib_gnu_path = Path::new("/lib/").join(format!("{}-linux-gnu", arch)); let lib_gnu_path = Path::new("/lib/").join(format!("{}-linux-gnu", target.architecture));
let libcrt_path = if usr_lib_gnu_path.exists() { let libcrt_path = if usr_lib_gnu_path.exists() {
&usr_lib_gnu_path &usr_lib_gnu_path