From 89ab27f28c9a0e933e52d8bbf678027d164eb8a3 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 25 Sep 2024 10:15:29 +1000 Subject: [PATCH] msan: ninja by default human users --- ci_build_images/msan.Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci_build_images/msan.Dockerfile b/ci_build_images/msan.Dockerfile index 9d8562a4..92bd2faa 100644 --- a/ci_build_images/msan.Dockerfile +++ b/ci_build_images/msan.Dockerfile @@ -142,10 +142,12 @@ RUN . /etc/os-release \ libsnappy-dev \ && chmod -R a+x $MSAN_LIBDIR/bin/* +# For convience of human users of msan image ENV MSAN_OPTIONS=abort_on_error=1:poison_in_dtor=0 -# rr installation -RUN apt-get install --no-install-recommends -y libcapnp-0.9.2 \ +ENV CMAKE_GENERATOR=Ninja +# rr installation + ninja +RUN apt-get install --no-install-recommends -y libcapnp-0.9.2 ninja-build \ && apt-get clean # unknown rr