Bump minimum macOS version to 10.15.7
This solves an issue with loading Swift libraries when running the x86_64 binary. Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
co-authored by
Nathan Sobo
parent
629d3d473c
commit
de24b4b4e8
@@ -57,7 +57,7 @@ fn compile_metal_shaders() {
|
||||
"macosx",
|
||||
"metal",
|
||||
"-gline-tables-only",
|
||||
"-mmacosx-version-min=10.14",
|
||||
"-mmacosx-version-min=10.15.7",
|
||||
"-MO",
|
||||
"-c",
|
||||
shader_path,
|
||||
|
||||
@@ -32,7 +32,7 @@ pub struct SwiftTarget {
|
||||
pub paths: SwiftPaths,
|
||||
}
|
||||
|
||||
const MACOS_TARGET_VERSION: &str = "10.15";
|
||||
const MACOS_TARGET_VERSION: &str = "10.15.7";
|
||||
|
||||
fn main() {
|
||||
if cfg!(not(any(test, feature = "test-support"))) {
|
||||
@@ -81,13 +81,9 @@ fn build_bridge(swift_target: &SwiftTarget) {
|
||||
}
|
||||
|
||||
fn link_swift_stdlib(swift_target: &SwiftTarget) {
|
||||
swift_target
|
||||
.paths
|
||||
.runtime_library_paths
|
||||
.iter()
|
||||
.for_each(|path| {
|
||||
println!("cargo:rustc-link-search=native={}", path);
|
||||
});
|
||||
for path in &swift_target.paths.runtime_library_paths {
|
||||
println!("cargo:rustc-link-search=native={}", path);
|
||||
}
|
||||
}
|
||||
|
||||
fn link_webrtc_framework(swift_target: &SwiftTarget) {
|
||||
|
||||
@@ -127,4 +127,4 @@ unindent = "0.1.7"
|
||||
icon = ["app-icon@2x.png", "app-icon.png"]
|
||||
identifier = "dev.zed.Zed"
|
||||
name = "Zed"
|
||||
osx_minimum_system_version = "10.14"
|
||||
osx_minimum_system_version = "10.15.7"
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
use std::process::Command;
|
||||
|
||||
fn main() {
|
||||
println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.14");
|
||||
println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
|
||||
|
||||
if let Ok(api_key) = std::env::var("ZED_AMPLITUDE_API_KEY") {
|
||||
println!("cargo:rustc-env=ZED_AMPLITUDE_API_KEY={api_key}");
|
||||
|
||||
Reference in New Issue
Block a user