From 271982534941958507dee057d0d6f2700126e8b1 Mon Sep 17 00:00:00 2001 From: Angelos Kolaitis Date: Tue, 27 Feb 2024 17:51:51 +0200 Subject: [PATCH] fix parallel builds --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a5fb0831..0224d6d8 100644 --- a/Makefile +++ b/Makefile @@ -23,29 +23,32 @@ go.bench.dqlite: ## Static Builds static: bin/static/k8s-dqlite bin/static/dqlite -bin/static/k8s-dqlite: $(GO_SOURCES) +deps/static/lib/libdqlite.a: + ./hack/static-dqlite.sh + +bin/static/k8s-dqlite: deps/static/lib/libdqlite.a $(GO_SOURCES) mkdir -p bin/static ./hack/static-go-build.sh -o bin/static/k8s-dqlite ./k8s-dqlite.go -bin/static/dqlite: +bin/static/dqlite: deps/static/lib/libdqlite.a mkdir -p bin/static rm -rf build/go-dqlite git clone https://github.com/canonical/go-dqlite --depth 1 -b v1.20.0 build/go-dqlite cd build/go-dqlite && ../../hack/static-go-build.sh -o ../../bin/static/dqlite ./cmd/dqlite ## Dynamic Builds -dynamic: bin/dynamic/k8s-dqlite bin/dynamic/dqlite bin/dynamic/lib/libdqlite.so +dynamic: bin/dynamic/k8s-dqlite bin/dynamic/dqlite bin/dynamic/lib/libdqlite.so: mkdir -p bin/dynamic/lib ./hack/dynamic-dqlite.sh cp -rv ./deps/dynamic/lib/* ./bin/dynamic/lib/ -bin/dynamic/k8s-dqlite: $(GO_SOURCES) +bin/dynamic/k8s-dqlite: bin/dynamic/lib/libdqlite.so $(GO_SOURCES) mkdir -p bin/dynamic ./hack/dynamic-go-build.sh -o bin/dynamic/k8s-dqlite ./k8s-dqlite.go -bin/dynamic/dqlite: +bin/dynamic/dqlite: bin/dynamic/lib/libdqlite.so mkdir -p bin/dynamic rm -rf build/go-dqlite git clone https://github.com/canonical/go-dqlite --depth 1 -b v1.20.0 build/go-dqlite