From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 14 Dec 2025 08:04:37 +0000 (+0900)
Subject: Merge branch 'tc/meson-cross-compile-fix'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25ce0883fe62cd17f8e79d9be05c010b7b59338d;p=thirdparty%2Fgit.git

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

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
---

25ce0883fe62cd17f8e79d9be05c010b7b59338d