bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '3270432f4b' into sync_cg_clif-2024-05-13

Browse source
This commit is contained in:
bjorn3 2024-05-13 13:26:33 +00:00
commit 75f8bdbca4
31 changed files with 481 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_codegen_cranelift/build_system/main.rs
View file

@ -147,9 +147,11 @@ fn main() {
let rustup_toolchain_name = match (env::var("CARGO"), env::var("RUSTC"), env::var("RUSTDOC")) {
(Ok(_), Ok(_), Ok(_)) => None,
(Err(_), Err(_), Err(_)) => Some(rustc_info::get_toolchain_name()),
_ => {
eprintln!("All of CARGO, RUSTC and RUSTDOC need to be set or none must be set");
(_, Err(_), Err(_)) => Some(rustc_info::get_toolchain_name()),
vars => {
eprintln!(
"If RUSTC or RUSTDOC is set, both need to be set and in addition CARGO needs to be set: {vars:?}"
);
process::exit(1);
}
};