From aaa42bcccb54f4025c0e129728432056b78e95d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Mon, 17 Apr 2017 15:30:55 +0200 Subject: [PATCH] build: Don't always expect a tests/headers directory. It may not exist after packaging. This should unblock publishing bindgen. --- build.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build.rs b/build.rs index 5b8489121b..bda91e28ac 100644 --- a/build.rs +++ b/build.rs @@ -28,13 +28,19 @@ mod testgen { let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()); let mut dst = File::create(Path::new(&out_dir).join("tests.rs")).unwrap(); - println!("cargo:rerun-if-changed=tests/headers"); let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()); let headers_dir = manifest_dir.join("tests").join("headers"); - let entries = fs::read_dir(headers_dir) - .expect("Couldn't read headers dir") - .map(|result| result.expect("Couldn't read header file")); + let headers = match fs::read_dir(headers_dir) { + Ok(dir) => dir, + // We may not have headers directory after packaging. + Err(..) => return, + }; + + let entries = + headers.map(|result| result.expect("Couldn't read header file")); + + println!("cargo:rerun-if-changed=tests/headers"); for entry in entries { match entry.path().extension().and_then(OsStr::to_str) {