mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error earlier if the rustc host cannot be found

Browse Source
This commit is contained in:
Guillaume Gomez 2023-12-18 23:25:23 +01:00
parent 9882d7c511
commit a8b0e30a8b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_system/src/config.rs
View File

@ -111,7 +111,10 @@ impl ConfigInfo {
Some(r) if !r.is_empty() => r.to_string(),
_ => "rustc".to_string(),
};
self.host_triple = rustc_version_info(Some(&rustc))?.host.unwrap_or_default();
self.host_triple = match rustc_version_info(Some(&rustc))?.host {
Some(host) => host,
None => return Err("no host found".to_string()),
};
if self.target_triple.is_empty() {
if let Some(overwrite) = env.get("OVERWRITE_TARGET_TRIPLE") {
@ -216,6 +219,8 @@ impl ConfigInfo {
));
let ld_library_path = format!(
"{target}:{sysroot}:{gcc_path}",
// FIXME: It's possible to pick another out directory. Would be nice to have a command
// line option to change it.
target = current_dir.join("target/out").display(),
sysroot = sysroot.display(),
);