language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix linker argument order

Browse source
This commit is contained in:
Richard Feldman 2020-10-04 09:04:09 -04:00
parent 8352591258
commit 841373edb2
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,8 @@ fn link_linux(
host_input_path: &Path, host_input_path: &Path,
dest_filename: &Path, dest_filename: &Path,
) -> io::Result<Child> { ) -> io::Result<Child> {
// NOTE: order of arguments to `ld` matters here!
// The `-l` flags should go after the `.o` arguments
Command::new("ld") Command::new("ld")
.args(&[ .args(&[
"-arch", "-arch",
@ -40,6 +42,12 @@ fn link_linux(
"/usr/lib/x86_64-linux-gnu/Scrt1.o", "/usr/lib/x86_64-linux-gnu/Scrt1.o",
"-dynamic-linker", "-dynamic-linker",
"/lib64/ld-linux-x86-64.so.2", "/lib64/ld-linux-x86-64.so.2",
// Output
"-o",
binary_path.to_str().unwrap(), // app
// Inputs
host_input_path.to_str().unwrap(), // host.o
dest_filename.to_str().unwrap(), // app.o
// Libraries - see https://github.com/rtfeldman/roc/pull/554#discussion_r496365925 // Libraries - see https://github.com/rtfeldman/roc/pull/554#discussion_r496365925
// for discussion and further references // for discussion and further references
"-lc", "-lc",
@ -51,11 +59,7 @@ fn link_linux(
"-lc_nonshared", "-lc_nonshared",
// "-lc++", // TODO shouldn't we need this? // "-lc++", // TODO shouldn't we need this?
// "-lgcc", // TODO will eventually need compiler_rt from gcc or something - see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840 // "-lgcc", // TODO will eventually need compiler_rt from gcc or something - see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840
// "-lunwind", // TODO will eventually need this, see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840 "-lunwind", // TODO will eventually need this, see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840
"-o",
binary_path.to_str().unwrap(), // app
host_input_path.to_str().unwrap(), // host.o
dest_filename.to_str().unwrap(), // roc_app.o
]) ])
.spawn() .spawn()
} }
@ -66,10 +70,18 @@ fn link_macos(
host_input_path: &Path, host_input_path: &Path,
dest_filename: &Path, dest_filename: &Path,
) -> io::Result<Child> { ) -> io::Result<Child> {
// NOTE: order of arguments to `ld` matters here!
// The `-l` flags should go after the `.o` arguments
Command::new("ld") Command::new("ld")
.args(&[ .args(&[
"-arch", "-arch",
target.architecture.to_string().as_str(), target.architecture.to_string().as_str(),
// Output
"-o",
binary_path.to_str().unwrap(), // app
// Inputs
host_input_path.to_str().unwrap(), // host.o
dest_filename.to_str().unwrap(), // roc_app.o
// Libraries - see https://github.com/rtfeldman/roc/pull/554#discussion_r496392274 // Libraries - see https://github.com/rtfeldman/roc/pull/554#discussion_r496392274
// for discussion and further references // for discussion and further references
"-lSystem", "-lSystem",
@ -80,10 +92,6 @@ fn link_macos(
"-lc++", // TODO shouldn't we need this? "-lc++", // TODO shouldn't we need this?
// "-lgcc", // TODO will eventually need compiler_rt from gcc or something - see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840 // "-lgcc", // TODO will eventually need compiler_rt from gcc or something - see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840
// "-lunwind", // TODO will eventually need this, see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840 // "-lunwind", // TODO will eventually need this, see https://github.com/rtfeldman/roc/pull/554#discussion_r496370840
"-o",
binary_path.to_str().unwrap(), // app
host_input_path.to_str().unwrap(), // host.o
dest_filename.to_str().unwrap(), // roc_app.o
]) ])
.spawn() .spawn()
} }