mirror of
https://github.com/zed-industries/zed.git
synced 2025-02-06 18:46:49 +00:00
Allow using live_kit
with macOS >= 10.15
This commit is contained in:
parent
32c65cfb2a
commit
20778a0694
1 changed files with 2 additions and 12 deletions
|
@ -28,7 +28,7 @@ pub struct SwiftTarget {
|
||||||
pub paths: SwiftPaths,
|
pub paths: SwiftPaths,
|
||||||
}
|
}
|
||||||
|
|
||||||
const MACOS_TARGET_VERSION: &str = "12";
|
const MACOS_TARGET_VERSION: &str = "10.15";
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let swift_target = get_swift_target();
|
let swift_target = get_swift_target();
|
||||||
|
@ -52,13 +52,7 @@ fn build_bridge(swift_target: &SwiftTarget) {
|
||||||
if !Command::new("swift")
|
if !Command::new("swift")
|
||||||
.arg("build")
|
.arg("build")
|
||||||
.args(&["--configuration", &env::var("PROFILE").unwrap()])
|
.args(&["--configuration", &env::var("PROFILE").unwrap()])
|
||||||
.args(&[
|
.args(&["--triple", &swift_target.target.triple])
|
||||||
"--triple",
|
|
||||||
&format!(
|
|
||||||
"{}{}",
|
|
||||||
swift_target.target.unversioned_triple, MACOS_TARGET_VERSION
|
|
||||||
),
|
|
||||||
])
|
|
||||||
.current_dir(&swift_package_root)
|
.current_dir(&swift_package_root)
|
||||||
.status()
|
.status()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
|
@ -78,10 +72,6 @@ fn build_bridge(swift_target: &SwiftTarget) {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn link_swift_stdlib(swift_target: &SwiftTarget) {
|
fn link_swift_stdlib(swift_target: &SwiftTarget) {
|
||||||
if swift_target.target.libraries_require_rpath {
|
|
||||||
panic!("Libraries require RPath! Change minimum MacOS value to fix.")
|
|
||||||
}
|
|
||||||
|
|
||||||
swift_target
|
swift_target
|
||||||
.paths
|
.paths
|
||||||
.runtime_library_paths
|
.runtime_library_paths
|
||||||
|
|
Loading…
Reference in a new issue