From 1159be9d9824a5e9fa1228b8922e75d903f21047 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 1 Jul 2026 15:51:05 +0200 Subject: switch to building w/ Ninja --- Dockerfile | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f2c491..3bd2e86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.24 AS base FROM base AS builder -RUN build_deps='bash bsd-compat-headers build-base clang cmake coreutils git json-c-dev libgit2-dev libsodium-dev py3-pytest sqlite-dev valgrind' && \ +RUN build_deps='bash bsd-compat-headers build-base clang cmake coreutils git json-c-dev libgit2-dev libsodium-dev ninja py3-pytest sqlite-dev valgrind' && \ apk add -q --no-cache $build_deps ARG COMPILER=clang diff --git a/Makefile b/Makefile index 75b545e..7e5b0c4 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ build: @echo ----------------------------------------------------------------- @mkdir -p -- '$(call escape,$(build_dir)/cmake)' cmake \ - -G 'Unix Makefiles' \ + -G 'Ninja' \ -D 'CMAKE_C_COMPILER=$(call escape,$(COMPILER))' \ -D 'CMAKE_BUILD_TYPE=$(call escape,$(CONFIGURATION))' \ -D 'CMAKE_INSTALL_PREFIX=$(call escape,$(build_dir)/install)' \ @@ -46,7 +46,7 @@ build: -D 'FLAME_GRAPHS_DIR=$(call escape,$(build_dir)/flame_graphs)' \ -S '$(call escape,$(src_dir))' \ -B '$(call escape,$(build_dir)/cmake)' - cmake --build '$(call escape,$(build_dir)/cmake)' -- -j + cmake --build '$(call escape,$(build_dir)/cmake)' .PHONY: debug debug debug/%: CONFIGURATION := debug -- cgit v1.3