authoravatarclover caruso<git@paperclover.net>2026-10-25 04:16:40+00:00
committeravatarclover caruso<git@paperclover.net>2026-10-25 07:03:08+00:00
logd9be64c2f785fa2784f84239313b7323e19fad59
tree408ef3c703f997d147217463930995b4df4658de
parent53d905dfd53180623af4d00f4461b218223117e5

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

3 files changed, 11 insertions(+), 5 deletions(-)

platform/snow-leopard/Cargo.lock+8-2
...@@ -127,9 +127,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"...@@ -127,9 +127,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
127127
128[[package]]128[[package]]
129name = "base64"129name = "base64"
130version = "0.22.1"130version = "0.23.1"
131source = "registry+https://github.com/rust-lang/crates.io-index"131source = "registry+https://github.com/rust-lang/crates.io-index"
132checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"132checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
133133
134[[package]]134[[package]]
135name = "bit-set"135name = "bit-set"
...@@ -431,10 +431,15 @@ dependencies = [...@@ -431,10 +431,15 @@ dependencies = [
431 "base64",431 "base64",
432 "bytemuck",432 "bytemuck",
433 "image",433 "image",
434 "js-sys",
434 "linebender_resource_handle",435 "linebender_resource_handle",
435 "parley",436 "parley",
436 "roxmltree",437 "roxmltree",
438 "skrifa",
437 "swash",439 "swash",
440 "wasm-bindgen",
441 "web-sys",
442 "web-time",
438 "wgpu",443 "wgpu",
439 "windows",444 "windows",
440]445]
...@@ -2322,6 +2327,7 @@ dependencies = [...@@ -2322,6 +2327,7 @@ dependencies = [
2322 "draw",2327 "draw",
2323 "nucleo-matcher",2328 "nucleo-matcher",
2324 "parley",2329 "parley",
2330 "web-time",
2325 "winit",2331 "winit",
2326]2332]
23272333
platform/snow-leopard/cargo.sh+2-2
...@@ -19,7 +19,7 @@ SNOW_LEOPARD_SDK=$sdk \...@@ -19,7 +19,7 @@ SNOW_LEOPARD_SDK=$sdk \
19TARGET_CFLAGS="-isysroot $sdk -mmacosx-version-min=10.6" \19TARGET_CFLAGS="-isysroot $sdk -mmacosx-version-min=10.6" \
20MACOSX_DEPLOYMENT_TARGET=10.6 \20MACOSX_DEPLOYMENT_TARGET=10.6 \
21exec cargo +nightly -Zbuild-std=std,panic_unwind -Zjson-target-spec \21exec cargo +nightly -Zbuild-std=std,panic_unwind -Zjson-target-spec \
22 --config "target.$target.linker='$here/link.sh'" \22 --config "target.\"$target\".linker='$here/link.sh'" \
23 --config "target.$target.rustflags=['-C','linker-flavor=darwin-cc','-C','metadata=rt-$runtime','--cfg','mio_unsupported_force_waker_pipe']" \23 --config "target.\"$target\".rustflags=['-C','linker-flavor=darwin-cc','-C','metadata=rt-$runtime','--cfg','mio_unsupported_force_waker_pipe']" \
24 --config "profile.dev.package.objc2.debug-assertions=false" \24 --config "profile.dev.package.objc2.debug-assertions=false" \
25 "$command" --target "$here/$target.json" "$@"25 "$command" --target "$here/$target.json" "$@"
platform/snow-leopard/reference/src/main.rs+1-1
...@@ -73,7 +73,7 @@ fn paint(out: &str, size: [u32; 2], clear: [f32; 4], layers: &[draw::Layer<'_>])...@@ -73,7 +73,7 @@ fn paint(out: &str, size: [u32; 2], clear: [f32; 4], layers: &[draw::Layer<'_>])
73 view_formats: &[],73 view_formats: &[],
74 });74 });
75 renderer75 renderer
76 .draw(&texture.create_view(&Default::default()), size, clear, layers)76 .draw(&texture.create_view(&Default::default()).into(), size, clear, layers)
77 .unwrap();77 .unwrap();
78 let row = (width * 4).next_multiple_of(wgpu::COPY_BYTES_PER_ROW_ALIGNMENT);78 let row = (width * 4).next_multiple_of(wgpu::COPY_BYTES_PER_ROW_ALIGNMENT);
79 let buffer = device.create_buffer(&wgpu::BufferDescriptor {79 let buffer = device.create_buffer(&wgpu::BufferDescriptor {