fixed cargo-miri bug for windows users
This commit is contained in:
parent
2b3b865c28
commit
610dbdd562
@ -333,17 +333,11 @@ path = "lib.rs"
|
||||
None => true,
|
||||
Some(target) => target == rustc_version::version_meta().unwrap().host,
|
||||
};
|
||||
let mut sysroot = if is_host { dir.join("HOST") } else { PathBuf::from(dir) };
|
||||
if cfg!(target_os = "windows") {
|
||||
// Replace backslashes in path to slashes as they cause problems.
|
||||
// Win10 Powershell can work with slashes in paths.
|
||||
sysroot = PathBuf::from(
|
||||
String::from(sysroot.to_str().unwrap()).replace("\\", "/")
|
||||
);
|
||||
}
|
||||
let sysroot = if is_host { dir.join("HOST") } else { PathBuf::from(dir) };
|
||||
|
||||
std::env::set_var("MIRI_SYSROOT", &sysroot); // pass the env var to the processes we spawn, which will turn it into "--sysroot" flags
|
||||
if print_env {
|
||||
println!("MIRI_SYSROOT={}", sysroot.display());
|
||||
println!("MIRI_SYSROOT={:?}", &sysroot); // for Windows users, prints path with backslashes escaped.
|
||||
} else if !ask_user {
|
||||
println!("A libstd for Miri is now available in `{}`.", sysroot.display());
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user