From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Jul 2026 17:42:16 +0000 (-0700)
Subject: Merge branch 'sn/osxkeychain-rust-universal'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8ec2c6aeedf361f9921a2a1900fbb6f90c4b6d8;p=thirdparty%2Fgit.git

Merge branch 'sn/osxkeychain-rust-universal'

The build system has been updated to support building universal macOS
binaries when 'Rust' is enabled, by compiling separate static archives
for each target triple listed in 'RUST_TARGETS' and combining them
using the macOS 'lipo' tool.  The 'git-credential-osxkeychain' helper
has been updated to link against '$(RUST_LIB)' when 'Rust' is enabled.

* sn/osxkeychain-rust-universal:
  contrib: wire up osxkeychain in contrib/Makefile on macOS
  Makefile: support universal macOS builds via RUST_TARGETS
  Makefile: add $(RUST_LIB) prerequisite to osxkeychain
---

f8ec2c6aeedf361f9921a2a1900fbb6f90c4b6d8