From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Dec 2025 05:53:02 +0000 (+0900)
Subject: Merge branch 'tc/meson-cross-compile-fix' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c45b57ca74e3ee15a82d06ea2978bf1b60566d25;p=thirdparty%2Fgit.git

Merge branch 'tc/meson-cross-compile-fix' into next

Build fix.

* tc/meson-cross-compile-fix:
  meson: use is_cross_build() where possible
  meson: only detect ICONV_OMITS_BOM if possible
  meson: ignore subprojects/.wraplock
---

c45b57ca74e3ee15a82d06ea2978bf1b60566d25