From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Mar 2026 19:25:21 +0000 (-0700)
Subject: Merge branch 'ps/build-tweaks' into rs/use-strvec-pushv
X-Git-Tag: v2.54.0-rc0~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d733b9660700fa4dd03a89d9003b8865b99bf4d;p=thirdparty%2Fgit.git

Merge branch 'ps/build-tweaks' into rs/use-strvec-pushv

The topic moves the coccinelle rules from contrib/ to tools/
directory, breaking merges with this topic.

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

2d733b9660700fa4dd03a89d9003b8865b99bf4d
diff --cc meson.build
index 9e9ba9b82b,2002f4795e..11488623bf
--- a/meson.build
+++ b/meson.build
@@@ -1438,9 -1429,9 +1441,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