language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 13:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

switch checking for str.zig to be relative to the exectuable

Browse source
This commit is contained in:
Brendan Hansknecht 2023-04-25 07:39:19 -07:00
parent 28146c939f
commit d47c4616f2
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
2 changed files with 40 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
use crate::target::{arch_str, target_zig_str};
use libloading::{Error, Library};
use roc_command_utils::{cargo, clang, get_lib_path, rustup, zig};
use roc_command_utils::{cargo, clang, rustup, zig};
use roc_error_macros::internal_error;
use roc_mono::ir::OptLevel;
use std::collections::HashMap;
@ -63,27 +63,53 @@ pub fn legacy_host_filename(target: &Triple) -> Option<String> {
)
}
fn find_zig_str_path() -> PathBuf {
// First try using the lib path relative to the executable location.
let lib_path_opt = get_lib_path();
// Attempts to find a file that is stored relative to the roc executable.
// Since roc is built in target/debug/roc, we may need to drop that path to find the file.
// This is used to avoid depending on the current working directory.
pub fn get_relative_path(sub_path: &Path) -> Option<PathBuf> {
if sub_path.is_absolute() {
internal_error!(
"get_relative_path requires sub_path to be relative, instead got {:?}",
sub_path
);
}
let exe_relative_str_path_opt = std::env::current_exe().ok();
if let Some(lib_path) = lib_path_opt {
let zig_str_path = lib_path.join("str.zig");
if let Some(exe_relative_str_path) = exe_relative_str_path_opt {
#[cfg(windows)]
let exe_relative_str_path = strip_windows_prefix(&exe_relative_str_path);
if std::path::Path::exists(&zig_str_path) {
return zig_str_path;
let mut curr_parent_opt = exe_relative_str_path.parent();
// this differs for regular build and nix releases, so we check in multiple spots.
// We also need to drop at least 2 folders to go from ./target/debug/... to ./...
for _ in 0..3 {
if let Some(curr_parent) = curr_parent_opt {
let potenial_path = curr_parent.join(sub_path);
if std::path::Path::exists(&potenial_path) {
return Some(potenial_path);
} else {
curr_parent_opt = curr_parent.parent();
}
} else {
break;
}
}
}
let zig_str_path = PathBuf::from("crates/compiler/builtins/bitcode/src/str.zig");
None
}
if std::path::Path::exists(&zig_str_path) {
fn find_zig_str_path() -> PathBuf {
// First try using the repo path relative to the executable location.
let zig_str_path = get_relative_path(Path::new("crates/compiler/builtins/bitcode/src/str.zig"));
if let Some(zig_str_path) = zig_str_path {
return zig_str_path;
}
// when running the tests, we start in the /cli directory
let zig_str_path = PathBuf::from("../compiler/builtins/bitcode/src/str.zig");
if std::path::Path::exists(&zig_str_path) {
// Fallback on a lib path relative to the executable location.
let zig_str_path = get_relative_path(Path::new("lib/str.zig"));
if let Some(zig_str_path) = zig_str_path {
return zig_str_path;
}