diff --git a/Cargo.toml b/Cargo.toml index eb3c5a59..2277e4b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.2.2+3.2.1" authors = ["Alex Crichton "] license = "MIT/Apache-2.0" readme = "README.md" repository = "https://github.com/alexcrichton/openssl-src-rs" +edition = "2021" description = """ Source of OpenSSL and logic to build it. """ diff --git a/openssl b/openssl index cf287779..a7e99284 160000 --- a/openssl +++ b/openssl @@ -1 +1 @@ -Subproject commit cf2877791ce7508684109664f467c9e40987692f +Subproject commit a7e992847de83aa36be0c399c89db3fb827b0be2 diff --git a/src/lib.rs b/src/lib.rs index 52f7d295..4b904906 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -636,12 +636,21 @@ fn cp_r(src: &Path, dst: &Path) { } let dst = dst.join(name); - if f.file_type().unwrap().is_dir() { + let ty = f.file_type().unwrap(); + if ty.is_dir() { fs::create_dir_all(&dst).unwrap(); cp_r(&path, &dst); + } else if ty.is_symlink() { + // not needed to build + if path.iter().any(|p| p == "cloudflare-quiche") { + continue; + } + panic!("can't copy symlink {path:?}"); } else { let _ = fs::remove_file(&dst); - fs::copy(&path, &dst).unwrap(); + if let Err(e) = fs::copy(&path, &dst) { + panic!("failed to copy {path:?} to {dst:?}: {e}"); + } } } }