From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Mar 2026 18:00:01 +0000 (-0700)
Subject: Merge branch 'ps/build-tweaks'
X-Git-Tag: v2.54.0-rc0~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1f07dd50087bef18246feffb963d73b23e2cdd6;p=thirdparty%2Fgit.git

Merge branch 'ps/build-tweaks'

Tweak the build infrastructure by moving tools around.

* ps/build-tweaks:
  meson: precompile "git-compat-util.h"
  meson: compile compatibility sources separately
  git-compat-util.h: move warning infra to prepare for PCHs
  builds: move build scripts into "tools/"
  contrib: move "update-unicode.sh" script into "tools/"
  contrib: move "coverage-diff.sh" script into "tools/"
  contrib: move "coccinelle/" directory into "tools/"
  Introduce new "tools/" directory
---

d1f07dd50087bef18246feffb963d73b23e2cdd6
diff --cc meson.build
index 1b0e431d5f,2002f4795e..8309942d18
--- a/meson.build
+++ b/meson.build
@@@ -1439,9 -1429,9 +1442,9 @@@ els
      'getpagesize' : [],
    }
  
 -  if get_option('b_sanitize').contains('address')
 +  if get_option('b_sanitize').contains('address') or get_option('b_sanitize').contains('leak')
      libgit_c_args += '-DNO_MMAP'
-     libgit_sources += 'compat/mmap.c'
+     compat_sources += 'compat/mmap.c'
    else
      checkfuncs += { 'mmap': ['mmap.c'] }
    endif