about summary refs log tree commit diff
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2023-09-11 10:33:50 -0400
committerdanakj <danakj@chromium.org>2023-09-18 09:38:12 -0400
commitb7e98e13cdbd6319fab38b6edc233e3d2925d567 (patch)
tree07b9b5b35a334d6e147975e564d98d600d111dee
parent4eb1b527944ab69d769530b5bd96e848c50560e7 (diff)
downloadrust-b7e98e13cdbd6319fab38b6edc233e3d2925d567.tar.gz
rust-b7e98e13cdbd6319fab38b6edc233e3d2925d567.zip
Document that the macabi sanitizers are shared with darwin
Do not rename and resign the darwin sanitizers a second time for
macabi.
-rw-r--r--src/bootstrap/compile.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index e02415153a8..4f19ffa83db 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -570,13 +570,14 @@ fn copy_sanitizers(
         let dst = libdir.join(&runtime.name);
         builder.copy(&runtime.path, &dst);
 
+        // The `aarch64-apple-ios-macabi` and `x86_64-apple-ios-macabi` are also supported for
+        // sanitizers, but they share a sanitizer runtime with `${arch}-apple-darwin`, so we do
+        // not list them here to rename and sign the runtime library.
         if target == "x86_64-apple-darwin"
             || target == "aarch64-apple-darwin"
             || target == "aarch64-apple-ios"
             || target == "aarch64-apple-ios-sim"
-            || target == "aarch64-apple-ios-catalyst"
             || target == "x86_64-apple-ios"
-            || target == "x86_64-apple-ios-catalyst"
         {
             // Update the library’s install name to reflect that it has been renamed.
             apple_darwin_update_library_name(&dst, &format!("@rpath/{}", &runtime.name));