Skip to content

Commit c73bd12

Browse files
committed
Remove now no-longer-necessary patches
1 parent eef95f2 commit c73bd12

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

src/lib.rs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,6 @@ fn cp_r(src: &Path, dst: &Path) {
453453

454454
fn apply_patches(target: &str, inner: &Path) {
455455
apply_patches_musl(target, inner);
456-
apply_patches_aarch64_apple_darwin(target, inner);
457456
}
458457

459458
fn apply_patches_musl(target: &str, inner: &Path) {
@@ -473,40 +472,6 @@ fn apply_patches_musl(target: &str, inner: &Path) {
473472
fs::write(path, buf).unwrap();
474473
}
475474

476-
fn apply_patches_aarch64_apple_darwin(target: &str, inner: &Path) {
477-
if target != "aarch64-apple-darwin" {
478-
return;
479-
}
480-
481-
// Apply build system changes to allow configuring and building
482-
// for Apple's ARM64 platform.
483-
// https://github.com/openssl/openssl/pull/12369
484-
485-
let path = inner.join("Configurations/10-main.conf");
486-
let mut buf = fs::read_to_string(&path).unwrap();
487-
488-
assert!(
489-
!buf.contains("darwin64-arm64-cc"),
490-
"{} already contains instructions for aarch64-apple-darwin",
491-
path.display(),
492-
);
493-
494-
const PATCH: &str = r#"
495-
"darwin64-arm64-cc" => {
496-
inherit_from => [ "darwin-common", asm("aarch64_asm") ],
497-
CFLAGS => add("-Wall"),
498-
cflags => add("-arch arm64"),
499-
lib_cppflags => add("-DL_ENDIAN"),
500-
bn_ops => "SIXTY_FOUR_BIT_LONG",
501-
perlasm_scheme => "ios64",
502-
},"#;
503-
504-
let x86_64_stanza = buf.find(r#" "darwin64-x86_64-cc""#).unwrap();
505-
buf.insert_str(x86_64_stanza, PATCH);
506-
507-
fs::write(path, buf).unwrap();
508-
}
509-
510475
fn sanitize_sh(path: &Path) -> String {
511476
if !cfg!(windows) {
512477
return path.to_str().unwrap().to_string();

0 commit comments

Comments
 (0)