]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/build-tweaks'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2026 18:00:01 +0000 (11:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2026 18:00:01 +0000 (11:00 -0700)
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

1  2 
Makefile
meson.build
tools/coccinelle/strbuf.cocci

diff --cc Makefile
Simple merge
diff --cc meson.build
index 1b0e431d5f749b6f6fe86031f00a76078701642d,2002f4795eb2ab1c7fb29db30952e8b1b943733b..8309942d184847ea6434bae30e81dbbbf175192d
@@@ -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
Simple merge