From d9be64c2f785fa2784f84239313b7323e19fad59 Mon Sep 17 00:00:00 2001 From: clover caruso Date: Sun, 25 Oct 2026 04:16:40 +0000 Subject: [PATCH] chore(10.6): link the 10.6 build through link.sh again Nightly cargo now reads the `.` in `x86_64-apple-macosx10.6` as a key separator in `--config`, so cargo.sh's linker and rustflags for the target went unused, with only a warning, and rustc linked through `cc` against the current SDK: an LC_MAIN executable for 10.12 that dyld cannot start on 10.6. The keys quote the target's name now. `reference` passes draw's `Renderer::draw` the `Target` it takes now, and the 10.6 workspace's lockfile follows main's crates. Assisted-by: claude-sonnet-5.5 --- platform/snow-leopard/Cargo.lock | 10 ++++++++-- platform/snow-leopard/cargo.sh | 4 ++-- platform/snow-leopard/reference/src/main.rs | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/platform/snow-leopard/Cargo.lock b/platform/snow-leopard/Cargo.lock index cd58ebd074e99ee55420b2d869bcc08bfb013144..30fd9bbb333121622a3377c99ca6b873a06c4cf2 100644 --- a/platform/snow-leopard/Cargo.lock +++ b/platform/snow-leopard/Cargo.lock @@ -127,9 +127,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "base64" -version = "0.22.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] name = "bit-set" @@ -431,10 +431,15 @@ dependencies = [ "base64", "bytemuck", "image", + "js-sys", "linebender_resource_handle", "parley", "roxmltree", + "skrifa", "swash", + "wasm-bindgen", + "web-sys", + "web-time", "wgpu", "windows", ] @@ -2322,6 +2327,7 @@ dependencies = [ "draw", "nucleo-matcher", "parley", + "web-time", "winit", ] diff --git a/platform/snow-leopard/cargo.sh b/platform/snow-leopard/cargo.sh index 0e694fb4668f96ac6c1737a8ceb57f1c231cdbf6..868648fc9dbb711f4e6474dfdbf42e728ab4b6cc 100755 --- a/platform/snow-leopard/cargo.sh +++ b/platform/snow-leopard/cargo.sh @@ -19,7 +19,7 @@ SNOW_LEOPARD_SDK=$sdk \ TARGET_CFLAGS="-isysroot $sdk -mmacosx-version-min=10.6" \ MACOSX_DEPLOYMENT_TARGET=10.6 \ exec cargo +nightly -Zbuild-std=std,panic_unwind -Zjson-target-spec \ - --config "target.$target.linker='$here/link.sh'" \ - --config "target.$target.rustflags=['-C','linker-flavor=darwin-cc','-C','metadata=rt-$runtime','--cfg','mio_unsupported_force_waker_pipe']" \ + --config "target.\"$target\".linker='$here/link.sh'" \ + --config "target.\"$target\".rustflags=['-C','linker-flavor=darwin-cc','-C','metadata=rt-$runtime','--cfg','mio_unsupported_force_waker_pipe']" \ --config "profile.dev.package.objc2.debug-assertions=false" \ "$command" --target "$here/$target.json" "$@" diff --git a/platform/snow-leopard/reference/src/main.rs b/platform/snow-leopard/reference/src/main.rs index 62d1c09f85b28b2bb6a272f47c4394d6cb55a955..ff903ac2ca79afaa1e0a7f325471dc97165bb68b 100644 --- a/platform/snow-leopard/reference/src/main.rs +++ b/platform/snow-leopard/reference/src/main.rs @@ -73,7 +73,7 @@ fn paint(out: &str, size: [u32; 2], clear: [f32; 4], layers: &[draw::Layer<'_>]) view_formats: &[], }); renderer - .draw(&texture.create_view(&Default::default()), size, clear, layers) + .draw(&texture.create_view(&Default::default()).into(), size, clear, layers) .unwrap(); let row = (width * 4).next_multiple_of(wgpu::COPY_BYTES_PER_ROW_ALIGNMENT); let buffer = device.create_buffer(&wgpu::BufferDescriptor { -- 2.54.1