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

simplify host extension

Browse source
This commit is contained in:
Folkert 2022-12-28 21:18:55 +01:00
parent 1995d8b3df
commit 356875a851
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 6 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,31 +60,6 @@ pub fn link(
}
}
const fn legacy_host_filename_ext(
os: roc_target::OperatingSystem,
opt_level: OptLevel,
) -> &'static str {
use roc_target::OperatingSystem::*;
match os {
Wasi => {
// TODO wasm host extension should be something else ideally
// .bc does not seem to work because
//
// > Non-Emscripten WebAssembly hasn't implemented __builtin_return_address
//
// and zig does not currently emit `.a` webassembly static libraries
if matches!(opt_level, OptLevel::Development) {
"wasm"
} else {
"zig"
}
}
Unix => "o",
Windows => "obj",
}
}
const PRECOMPILED_HOST_EXT: &str = "rh1"; // Short for "roc host version 1" (so we can change format in the future)
const WASM_TARGET_STR: &str = "wasm32";
@ -208,9 +183,9 @@ pub fn get_target_triple_str(target: &Triple) -> Option<&'static str> {
}
/// Same format as the precompiled host filename, except with a file extension like ".o" or ".obj"
pub fn legacy_host_filename(target: &Triple, opt_level: OptLevel) -> Option<String> {
pub fn legacy_host_filename(target: &Triple) -> Option<String> {
let os = roc_target::OperatingSystem::from(target.operating_system);
let ext = legacy_host_filename_ext(os, opt_level);
let ext = os.object_file_ext();
Some(preprocessed_host_filename(target)?.replace(PRECOMPILED_HOST_EXT, ext))
}
@ -698,7 +673,7 @@ pub fn rebuild_host(
.with_file_name("dynhost")
.with_extension(executable_extension)
} else {
host_input_path.with_file_name(legacy_host_filename(target, opt_level).unwrap())
host_input_path.with_file_name(legacy_host_filename(target).unwrap())
};
let env_path = env::var("PATH").unwrap_or_else(|_| "".to_string());