github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-17 00:32:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build macOS x86-64 with Rust 1.73.0 in make_pkg.sh
Some checks failed
make test / macos (push) Waiting to run
Details
make test / ubuntu (push) Waiting to run
Details
make test / ubuntu-32bit-static-pcre2 (push) Waiting to run
Details
make test / ubuntu-asan (push) Waiting to run
Details
Rust checks / rustfmt (push) Waiting to run
Details
Rust checks / clippy (push) Waiting to run
Details
Lock threads / lock (push) Has been cancelled
Details

Browse Source 
This retains compatibility with macOS 10.9.
Note that Apple Silicon Macs shipped with 10.15, so compatibility for Apple
Silicon is not a concern.
This commit is contained in:
Peter Ammon 2024-10-13 12:30:00 -07:00
parent 9337c20c2e
commit fbf0ad98af
No known key found for this signature in database
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/mac_codesign.yml vendored
View File

@ -9,9 +9,14 @@ jobs:
environment: macos-codesign environment: macos-codesign
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.79 - name: Install Rust 1.73.0
uses: dtolnay/rust-toolchain@1.73.0
with: with:
targets: aarch64-apple-darwin,x86_64-apple-darwin targets: x86_64-apple-darwin
- name: Install Rust 1.79
uses: dtolnay/rust-toolchain@1.79
with:
targets: aarch64-apple-darwin
- name: build-and-codesign - name: build-and-codesign
run: | run: |
cargo install apple-codesign cargo install apple-codesign

8
build_tools/make_pkg.sh
View File

@ -26,6 +26,12 @@ NOTARIZE=
ARM64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=11.0' ARM64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=11.0'
X86_64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=10.9' X86_64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=10.9'
# As of this writing, the most recent Rust release supports macOS back to 10.12.
# The first supported version of macOS on arm64 is 10.15, so any Rust is fine for arm64.
# We wish to support back to 10.9 on x86-64; the last version of Rust to support that is
# version 1.73.0.
RUST_VERSION_X86_64=1.73.0
while getopts "sf:i:p:e:nj:" opt; do while getopts "sf:i:p:e:nj:" opt; do
case $opt in case $opt in
s) SIGN=1;; s) SIGN=1;;
@ -83,11 +89,13 @@ mkdir -p "$PKGDIR/build_x86_64" "$PKGDIR/build_arm64" "$PKGDIR/root" "$PKGDIR/in
} }
# Build for x86-64 but do not install; instead we will make some fat binaries inside the root. # Build for x86-64 but do not install; instead we will make some fat binaries inside the root.
# Set RUST_VERSION_X86_64 to the last version of Rust that supports macOS 10.9.
{ cd "$PKGDIR/build_x86_64" \ { cd "$PKGDIR/build_x86_64" \
&& cmake \ && cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \
-DWITH_GETTEXT=OFF \ -DWITH_GETTEXT=OFF \
-DRust_TOOLCHAIN="$RUST_VERSION_X86_64" \
-DRust_CARGO_TARGET=x86_64-apple-darwin \ -DRust_CARGO_TARGET=x86_64-apple-darwin \
-DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \ -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \
-DFISH_USE_SYSTEM_PCRE2=OFF "$SRC_DIR" \ -DFISH_USE_SYSTEM_PCRE2=OFF "$SRC_DIR" \