Auto merge of #40337 - alexcrichton:racy-dirs, r=brson
rustbuild: Assert directory creation succeeds I've been seeing failures on the bots when building jemalloc and my assumption is that it's because cwd isn't created. That may be possible if this `create_dir_all` call change in this commit fails, in which case we ignore the error. This commit updates the location to call `create_dir_racy` which handles concurrent invocations, as multiple build scripts may be trying to create the `native` dir.
This commit is contained in:
commit
5c9208faf1
@ -12,10 +12,11 @@
|
||||
|
||||
extern crate filetime;
|
||||
|
||||
use std::{fs, env};
|
||||
use std::fs::File;
|
||||
use std::process::{Command, Stdio};
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::{Command, Stdio};
|
||||
use std::{fs, env};
|
||||
|
||||
use filetime::FileTime;
|
||||
|
||||
@ -196,7 +197,7 @@ pub fn native_lib_boilerplate(src_name: &str,
|
||||
|
||||
let out_dir = env::var_os("RUSTBUILD_NATIVE_DIR").unwrap_or(env::var_os("OUT_DIR").unwrap());
|
||||
let out_dir = PathBuf::from(out_dir).join(out_name);
|
||||
let _ = fs::create_dir_all(&out_dir);
|
||||
t!(create_dir_racy(&out_dir));
|
||||
println!("cargo:rustc-link-lib=static={}", link_name);
|
||||
println!("cargo:rustc-link-search=native={}", out_dir.join(search_subdir).display());
|
||||
|
||||
@ -223,3 +224,21 @@ fn fail(s: &str) -> ! {
|
||||
println!("\n\n{}\n\n", s);
|
||||
std::process::exit(1);
|
||||
}
|
||||
|
||||
fn create_dir_racy(path: &Path) -> io::Result<()> {
|
||||
match fs::create_dir(path) {
|
||||
Ok(()) => return Ok(()),
|
||||
Err(ref e) if e.kind() == io::ErrorKind::AlreadyExists => return Ok(()),
|
||||
Err(ref e) if e.kind() == io::ErrorKind::NotFound => {}
|
||||
Err(e) => return Err(e),
|
||||
}
|
||||
match path.parent() {
|
||||
Some(p) => try!(create_dir_racy(p)),
|
||||
None => return Err(io::Error::new(io::ErrorKind::Other, "failed to create whole tree")),
|
||||
}
|
||||
match fs::create_dir(path) {
|
||||
Ok(()) => Ok(()),
|
||||
Err(ref e) if e.kind() == io::ErrorKind::AlreadyExists => Ok(()),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user