From a707b6b5839721416b91e0a9979eba3f706d418a Mon Sep 17 00:00:00 2001 From: Jason Dagit Date: Mon, 30 Sep 2024 02:40:32 -0700 Subject: [PATCH 1/2] can we support 10.13 --- .cargo/config.toml | 10 ++++++++-- .github/workflows/onpush.yml | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 9034794..314bb2d 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,5 +1,11 @@ [target.x86_64-apple-darwin] -rustflags = ["-C", "link-arg=-Wl,-platform_version,macOS,11.0,12.0"] +rustflags = [ + "-C", "link-arg=-mmacosx-version-min=10.13", + "-C", "link-arg=-Wl,-no_fixup_chains" +] [target.aarch64-apple-darwin] -rustflags = ["-C", "link-arg=-Wl,-platform_version,macOS,11.0,12.0"] +rustflags = [ + "-C", "link-arg=-mmacosx-version-min=10.13", + "-C", "link-arg=-Wl,-no_fixup_chains" +] diff --git a/.github/workflows/onpush.yml b/.github/workflows/onpush.yml index a4ef579..aa985b6 100644 --- a/.github/workflows/onpush.yml +++ b/.github/workflows/onpush.yml @@ -214,13 +214,13 @@ jobs: - name: Set MACOSX_DEPLOYMENT_TARGET (macOS) if: ${{ matrix.is-osx }} - run: echo "MACOSX_DEPLOYMENT_TARGET=11.0" >> $GITHUB_ENV + run: echo "MACOSX_DEPLOYMENT_TARGET=10.13" >> $GITHUB_ENV - name: Set CFLAGS and LDFLAGS for Native Code if: ${{ matrix.is-osx }} run: | - echo "CFLAGS=-mmacosx-version-min=11.0" >> $GITHUB_ENV - echo "LDFLAGS=-mmacosx-version-min=11.0" >> $GITHUB_ENV + echo "CFLAGS=-mmacosx-version-min=10.13" >> $GITHUB_ENV + echo "LDFLAGS=-mmacosx-version-min=10.13" >> $GITHUB_ENV - name: Build for x86_64-apple-darwin (macOS) if: ${{ matrix.is-osx }} @@ -230,7 +230,7 @@ jobs: - name: Check min version (x86) if: ${{ matrix.is-osx }} run: | - otool -l target/x86_64-apple-darwin/release/annelid | grep -A 3 LC_BUILD_VERSION + otool -l target/x86_64-apple-darwin/release/annelid | grep -A 3 LC_VERSION_MIN_MACOSX - name: Build for aarch64-apple-darwin (macOS) if: ${{ matrix.is-osx }} @@ -240,7 +240,7 @@ jobs: - name: Check min version (arm) if: ${{ matrix.is-osx }} run: | - otool -l target/aarch64-apple-darwin/release/annelid | grep -A 3 LC_BUILD_VERSION + otool -l target/aarch64-apple-darwin/release/annelid | grep -A 3 LC_VERSION_MIN_MACOSX - name: Create universal binary (macOS) if: ${{ matrix.is-osx }} From f86d0630b704d87abfd3cf61bc3b4dfa4cf96699 Mon Sep 17 00:00:00 2001 From: Jason Dagit Date: Mon, 30 Sep 2024 02:53:09 -0700 Subject: [PATCH 2/2] accept LC_BUILD or LC_VERSION --- .github/workflows/onpush.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/onpush.yml b/.github/workflows/onpush.yml index aa985b6..55d6c7e 100644 --- a/.github/workflows/onpush.yml +++ b/.github/workflows/onpush.yml @@ -230,7 +230,7 @@ jobs: - name: Check min version (x86) if: ${{ matrix.is-osx }} run: | - otool -l target/x86_64-apple-darwin/release/annelid | grep -A 3 LC_VERSION_MIN_MACOSX + otool -l target/x86_64-apple-darwin/release/annelid | grep -A 3 -E 'LC_BUILD_VERSION|LC_VERSION_MIN_MACOSX' - name: Build for aarch64-apple-darwin (macOS) if: ${{ matrix.is-osx }} @@ -240,7 +240,7 @@ jobs: - name: Check min version (arm) if: ${{ matrix.is-osx }} run: | - otool -l target/aarch64-apple-darwin/release/annelid | grep -A 3 LC_VERSION_MIN_MACOSX + otool -l target/aarch64-apple-darwin/release/annelid | grep -A 3 -E 'LC_BUILD_VERSION|LC_VERSION_MIN_MACOSX' - name: Create universal binary (macOS) if: ${{ matrix.is-osx }}