From c183e854d76962aa879c9f42c1b9629ae48d5156 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 8 Nov 2022 13:44:31 +0100 Subject: [PATCH 1/2] Weakly link ReplayKit to ensure this library can be used on macOS 10.15 --- crates/live_kit_client/build.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/live_kit_client/build.rs b/crates/live_kit_client/build.rs index bceb4fb927da826920cab1af91b67a92325ea8a5..d9430736ad274cc1f010b18fb60165e9b06901fe 100644 --- a/crates/live_kit_client/build.rs +++ b/crates/live_kit_client/build.rs @@ -44,6 +44,9 @@ fn main() { // Register exported Objective-C selectors, protocols, etc when building example binaries. println!("cargo:rustc-link-arg=-Wl,-ObjC"); + + // Weakly link ReplayKit to ensure this library can be used on macOS 10.15+. + println!("cargo:rustc-link-arg=-Wl,-weak_framework ReplayKit"); } } From 3f1b95927f01c6acfa9659c89f4f6c2e414b53fa Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 8 Nov 2022 14:57:12 +0100 Subject: [PATCH 2/2] Move weak linking into zed's build.rs --- crates/live_kit_client/build.rs | 3 --- crates/zed/build.rs | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/live_kit_client/build.rs b/crates/live_kit_client/build.rs index d9430736ad274cc1f010b18fb60165e9b06901fe..bceb4fb927da826920cab1af91b67a92325ea8a5 100644 --- a/crates/live_kit_client/build.rs +++ b/crates/live_kit_client/build.rs @@ -44,9 +44,6 @@ fn main() { // Register exported Objective-C selectors, protocols, etc when building example binaries. println!("cargo:rustc-link-arg=-Wl,-ObjC"); - - // Weakly link ReplayKit to ensure this library can be used on macOS 10.15+. - println!("cargo:rustc-link-arg=-Wl,-weak_framework ReplayKit"); } } diff --git a/crates/zed/build.rs b/crates/zed/build.rs index 8622842c440619ecbbcc40518f483e1577859b6c..bb971041a5b08f863817cef5ffeec7bee8c015fd 100644 --- a/crates/zed/build.rs +++ b/crates/zed/build.rs @@ -16,6 +16,9 @@ fn main() { println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path"); } + // Weakly link ReplayKit to ensure Zed can be used on macOS 10.15+. + println!("cargo:rustc-link-arg=-Wl,-weak_framework,ReplayKit"); + // Seems to be required to enable Swift concurrency println!("cargo:rustc-link-arg=-Wl,-rpath,/usr/lib/swift");