diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 18b9eeb..ed3f9c5 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -47,8 +47,8 @@ jobs: runs-on: linux-arm64 container: ghcr.io/rust-cross/cargo-zigbuild@sha256:82af75c41958c2af2787e8bedd912da7678a9438937e223e9d83d006d747b38b env: - CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS: -Lnative=target/macos-linker -C link-arg=-mmacosx-version-min=26.0 -C link-arg=-Wl,-rpath,@executable_path/../Resources -C link-arg=-Wl,-headerpad,0x1000 -C link-arg=-Wl,-U,_OBJC_CLASS_$_MLComputePlan -C link-arg=-Wl,-U,_OBJC_CLASS_$_MLOptimizationHints - CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS: -Lnative=target/macos-linker -C link-arg=-mmacosx-version-min=26.0 -C link-arg=-Wl,-rpath,@executable_path/../Resources -C link-arg=-Wl,-headerpad,0x1000 -C link-arg=-Wl,-U,_OBJC_CLASS_$_MLComputePlan -C link-arg=-Wl,-U,_OBJC_CLASS_$_MLOptimizationHints + CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS: -Lnative=target/macos-linker -C link-arg=-mmacosx-version-min=26.0 -C link-arg=-Wl,-rpath,@executable_path/../Resources -C link-arg=-Wl,-headerpad,0x1000 -C link-arg=-Wl,-undefined,dynamic_lookup + CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS: -Lnative=target/macos-linker -C link-arg=-mmacosx-version-min=26.0 -C link-arg=-Wl,-rpath,@executable_path/../Resources -C link-arg=-Wl,-headerpad,0x1000 -C link-arg=-Wl,-undefined,dynamic_lookup steps: - name: Check out the tag env: diff --git a/crates/bds-ui/tests/packaging_assets.rs b/crates/bds-ui/tests/packaging_assets.rs index 18c8d5a..2ba7f3d 100644 --- a/crates/bds-ui/tests/packaging_assets.rs +++ b/crates/bds-ui/tests/packaging_assets.rs @@ -130,8 +130,7 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() { "cargo-zigbuild", "macos-linker-alias", "-Lnative=target/macos-linker", - "-Wl,-U,_OBJC_CLASS_$_MLComputePlan", - "-Wl,-U,_OBJC_CLASS_$_MLOptimizationHints", + "-Wl,-undefined,dynamic_lookup", "aarch64-apple-darwin", "x86_64-apple-darwin", "aarch64-unknown-linux-gnu", @@ -159,6 +158,10 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() { "release workflow is missing {required}" ); } + assert!( + !workflow.contains("-Wl,-U,"), + "Zig's Darwin linker does not support ld64's symbol-specific -U option" + ); for forbidden in ["python", "curl ", "hdiutil", "makensis", "tar -"] { assert!( !workflow.contains(forbidden),