Slightly simplify build script

This commit is contained in:
bjorn3
2021-10-12 15:10:54 +02:00
parent b0b8c1edbf
commit b2d9faa472

View File

@@ -46,15 +46,7 @@ fn main() {
isa_targets isa_targets
}; };
let cur_dir = env::current_dir().expect("Can't access current working directory"); println!("cargo:rerun-if-changed=build.rs");
let crate_dir = cur_dir.as_path();
// Make sure we rebuild if this build script changes (will not happen with
// if the path to this file contains non-UTF-8 bytes).
println!(
"cargo:rerun-if-changed={}",
crate_dir.join("build.rs").to_str().unwrap()
);
if let Err(err) = meta::generate(&isas, &out_dir) { if let Err(err) = meta::generate(&isas, &out_dir) {
eprintln!("Error: {}", err); eprintln!("Error: {}", err);
@@ -74,6 +66,7 @@ fn main() {
#[cfg(feature = "rebuild-peephole-optimizers")] #[cfg(feature = "rebuild-peephole-optimizers")]
{ {
let cur_dir = env::current_dir().expect("Can't access current working directory");
std::fs::write( std::fs::write(
std::path::Path::new(&out_dir).join("CRANELIFT_CODEGEN_PATH"), std::path::Path::new(&out_dir).join("CRANELIFT_CODEGEN_PATH"),
cur_dir.to_str().unwrap(), cur_dir.to_str().unwrap(),