language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Remove the .1 version libapp.so and the fileextension .1.0

Browse source
This commit is contained in:
Oskar Hahn 2024-04-01 12:41:09 +02:00
parent c72b95de97
commit aec618d5fc
No known key found for this signature in database
GPG key ID: E72581B1FE9F104C
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -967,7 +967,6 @@ fn link_linux(
let ld_linux_path_str = &ld_linux_path.to_string_lossy(); let ld_linux_path_str = &ld_linux_path.to_string_lossy();
let mut soname;
let (base_args, output_path) = match link_type { let (base_args, output_path) = match link_type {
LinkType::Executable => ( LinkType::Executable => (
// Presumably this S stands for Static, since if we include Scrt1.o // Presumably this S stands for Static, since if we include Scrt1.o
@ -976,17 +975,8 @@ fn link_linux(
output_path, output_path,
), ),
LinkType::Dylib => { LinkType::Dylib => {
// TODO: do we actually need the version number on this?
// Do we even need the "-soname" argument?
//
// See https://software.intel.com/content/www/us/en/develop/articles/create-a-unix-including-linux-shared-library.html
soname = output_path.clone();
soname.set_extension("so.1");
let mut output_path = output_path; let mut output_path = output_path;
output_path.set_extension("so");
output_path.set_extension("so.1.0");
( (
// TODO: find a way to avoid using a vec! here - should theoretically be // TODO: find a way to avoid using a vec! here - should theoretically be
@ -994,8 +984,6 @@ fn link_linux(
// Also find a way to have these be string slices instead of Strings. // Also find a way to have these be string slices instead of Strings.
vec![ vec![
"-shared".to_string(), "-shared".to_string(),
"-soname".to_string(),
soname.as_path().to_str().unwrap().to_string(),
], ],
output_path, output_path,
) )

2
crates/glue/src/load.rs
View file

@ -111,7 +111,7 @@ pub fn generate(
OperatingSystem::Windows => binary_path.with_extension("dll"), OperatingSystem::Windows => binary_path.with_extension("dll"),
OperatingSystem::Mac => binary_path.with_extension("dylib"), OperatingSystem::Mac => binary_path.with_extension("dylib"),
_ => binary_path.with_extension("so.1.0"), _ => binary_path.with_extension("so"),
}; };
// TODO: Should glue try and run with errors, especially type errors. // TODO: Should glue try and run with errors, especially type errors.