fix: consistent macOS target at 14.0

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

.cargo/config.macos-arm64.toml

@@ -54,7 +54,7 @@ rustflags = [
   # "-Zvirtual-function-elimination",
 
   # Explicit macOS target version to align with C-layer code.
-  "-Clink-arg=-mmacosx-version-min=15.0",
+  "-Clink-arg=-mmacosx-version-min=14.0",
 ]
 
 [env]
@@ -68,5 +68,4 @@ OPENSSL_LIB_DIR = { value = "target/lib", relative = true }
 OPENSSL_INCLUDE_DIR = { value = "target/include", relative = true }
 SQLITE3_LIB_DIR = { value = "target/lib", relative = true }
 SQLITE3_INCLUDE_DIR = { value = "target/include", relative = true }
-MACOSX_DEPLOYMENT_TARGET = { value = "15.0" }
-
+MACOSX_DEPLOYMENT_TARGET = { value = "14.0" }

.cargo/config.macos-x86_64.toml

@@ -51,13 +51,12 @@ rustflags = [
   # "-Zvirtual-function-elimination",
 
   # Explicit macOS target version to align with C-layer code.
-  "-Clink-arg=-mmacosx-version-min=15.0",
+  "-Clink-arg=-mmacosx-version-min=14.0",
 ]
 
 [env]
 ELIDE_ROOT = { value = ".", relative = true }
 SQLITE3_STATIC = { value = "1" }
 SQLITE3_LIB_DIR = { value = "target/lib", relative = true }
 SQLITE3_INCLUDE_DIR = { value = "target/include", relative = true }
-MACOSX_DEPLOYMENT_TARGET = { value = "15.0" }
-
+MACOSX_DEPLOYMENT_TARGET = { value = "14.0" }

Makefile

@@ -30,7 +30,7 @@ COVERAGE ?= yes
 BUILD_NATIVE_IMAGE ?= no
 BUILD_STDLIB ?= no
 RELEASE ?= no
-MACOS_MIN_VERSION ?= 12.3
+MACOS_MIN_VERSION ?= 14.0
 ENABLE_CCACHE ?= no
 ENABLE_SCCACHE ?= yes
 CUSTOM_JVM ?= no

crates/builder/src/lib.rs

@@ -47,7 +47,7 @@ const DEBUG: &str = "debug";
 const RELEASE: &str = "release";
 
 /// Minimum supported version of macOS.
-pub const MACOS_MIN: &str = "12.3";
+pub const MACOS_MIN: &str = "14.0";
 
 /// Minimum supported version of Android.
 const android_api_version: &str = "21";

crates/builder/src/model.rs

@@ -33,7 +33,7 @@ const DEBUG: &str = "debug";
 const RELEASE: &str = "release";
 
 /// Minimum supported version of macOS.
-pub const MACOS_MIN: &str = "12.3";
+pub const MACOS_MIN: &str = "14.0";
 
 /// Enumerates the types of build profiles which Elide supports.
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]

packages/cli/build.gradle.kts

@@ -1780,6 +1780,7 @@ val darwinOnlyArgs = defaultPlatformArgs.plus(listOfNotNull(
   "-R:MaximumHeapSizePercent=80",
   "--initialize-at-build-time=sun.awt.resources.awtosx",
   onlyIf(enableLto, "-H:NativeLinkerOption=-flto"),
+  onlyIf(TargetCriteria.allOf(elideTarget, Criteria.MacAmd64), "-H:NativeLinkerOption=-Wl,-ld_classic"),
   "-H:NativeLinkerOption=$nativesPath/libdiag.a",
   "-H:NativeLinkerOption=$nativesPath/libsqlitejdbc.a",
   "-H:NativeLinkerOption=$nativesPath/libumbrella.a",

packages/graalvm/build.gradle.kts

@@ -776,7 +776,7 @@ val buildRustNativesForHostRelease by tasks.registering(Exec::class) {
   executable = "cargo"
   args(baseCargoFlags.plus("--release"))
   environment("JAVA_HOME", System.getProperty("java.home"))
-  environment("MACOSX_DEPLOYMENT_TARGET", "15.0")
+  environment("MACOSX_DEPLOYMENT_TARGET", "14.0")
 
   outputs.upToDateWhen { true }
   outputs.dir(targetDir)
@@ -789,7 +789,7 @@ val buildRustNativesForHostDebug by tasks.registering(Exec::class) {
   executable = "cargo"
   args(baseCargoFlags)
   environment("JAVA_HOME", System.getProperty("java.home"))
-  environment("MACOSX_DEPLOYMENT_TARGET", "15.0")
+  environment("MACOSX_DEPLOYMENT_TARGET", "14.0")
 
   outputs.upToDateWhen { true }
   outputs.dir(targetDir)
@@ -802,7 +802,7 @@ val buildRustNativesForHost by tasks.registering(Exec::class) {
   executable = "cargo"
   args(baseCargoFlags.plus(listOfNotNull(if (isRelease) "--release" else null)))
   environment("JAVA_HOME", System.getProperty("java.home"))
-  environment("MACOSX_DEPLOYMENT_TARGET", "15.0")
+  environment("MACOSX_DEPLOYMENT_TARGET", "14.0")
 
   outputs.upToDateWhen { true }
   outputs.dir(targetDir)

third_party/Makefile

@@ -24,7 +24,7 @@ USE_NINJA ?= yes
 ENABLE_CCACHE ?= no
 ENABLE_SCCACHE ?= no
 ELIDE_ROOT ?= $(realpath $(shell pwd)/..)
-MACOS_MIN_VERSION ?= 12.3
+MACOS_MIN_VERSION ?= 14.0
 
 NATIVE_TOOLS ?= boringssl sqlite apr
 LANGS ?= pkl