summaryrefslogtreecommitdiffstats
path: root/meson.build
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-12-23 18:32:24 +0100
committerJunio C Hamano <gitster@pobox.com>2024-12-23 18:32:25 +0100
commit83c8f7623538e67262db18c98d9c1da6b50e289d (patch)
tree5e317bedaa760e01fda2f8fdd85d54a44f4ee79c /meson.build
parentMerge branch 'kl/doc-build-fix' (diff)
parentci: wire up Meson builds (diff)
downloadgit-83c8f7623538e67262db18c98d9c1da6b50e289d.tar.xz
git-83c8f7623538e67262db18c98d9c1da6b50e289d.zip
Merge branch 'ps/ci-meson'
The meson-build procedure is integrated into CI to catch and prevent bitrotting. * ps/ci-meson: ci: wire up Meson builds t: introduce compatibility options to clar-based tests t: fix out-of-tree tests for some git-p4 tests Makefile: detect missing Meson tests meson: detect missing tests at configure time t/unit-tests: rename clar-based unit tests to have a common prefix Makefile: drop -DSUPPRESS_ANNOTATED_LEAKS ci/lib: support custom output directories when creating test artifacts
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build1
1 files changed, 0 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 8e34a895dc..c7a909e48f 100644
--- a/meson.build
+++ b/meson.build
@@ -712,7 +712,6 @@ else
build_options_config.set('SANITIZE_ADDRESS', '')
endif
if get_option('b_sanitize').contains('leak')
- libgit_c_args += '-DSUPPRESS_ANNOTATED_LEAKS'
build_options_config.set('SANITIZE_LEAK', 'YesCompiledWithIt')
else
build_options_config.set('SANITIZE_LEAK', '')