From d5a2187713096c2d0192f9defad423f46f5a4dda Mon Sep 17 00:00:00 2001
From: Antonio SJ Musumeci <trapexit@spawn.link>
Date: Thu, 16 Apr 2026 13:07:41 -0500
Subject: [PATCH] Fix make race condition

---
 Makefile                  | 12 +++++++-----
 vendored/libfuse/Makefile |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index cbbfdd83..fd090dc9 100644
--- a/Makefile
+++ b/Makefile
@@ -184,20 +184,22 @@ help:
 $(BUILDDIR)/mergerfs: $(LIBFUSE) src/version.hpp $(OBJS)
 	$(CXX) $(CXXFLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LDLIBS)
 
-$(BUILDDIR)/fsck.mergerfs:
+$(BUILDDIR)/fsck.mergerfs: $(BUILDDIR)/mergerfs
 	$(LN) -sf "mergerfs" $@
 
-$(BUILDDIR)/mergerfs.collect-info:
+$(BUILDDIR)/mergerfs.collect-info: $(BUILDDIR)/mergerfs
 	$(LN) -sf "mergerfs" $@
 
 $(BUILDDIR)/tests: $(BUILDDIR)/mergerfs $(TESTS_OBJS)
 	$(CXX) $(CXXFLAGS) $(TESTS_FLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) $(TESTS_OBJS) -o $@ $(LDFLAGS) $(LDLIBS)
 
 .PHONY: libfuse
-$(LIBFUSE):
-libfuse:
+libfuse: $(LIBFUSE)
 	$(MAKE) -C vendored/libfuse
 
+$(LIBFUSE):
+	$(MAKE) -C vendored/libfuse $(BUILDDIR)/libfuse.a
+
 tests: $(BUILDDIR)/tests
 
 .PHONY:
@@ -222,7 +224,7 @@ $(BUILDDIR)/stamp:
 $(BUILDDIR)/.objs/%.cpp.o: src/%.cpp $(BUILDDIR)/stamp
 	$(CXX) $(CXXFLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) -c $< -o $@
 
-$(BUILDDIR)/.test_objs/%.cpp.o: tests/%.cpp
+$(BUILDDIR)/.test_objs/%.cpp.o: tests/%.cpp | $(BUILDDIR)/stamp
 	$(CXX) $(CXXFLAGS) $(TESTS_FLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) -c $< -o $@
 
 $(BUILDDIR)/preload.so: $(BUILDDIR)/stamp tools/preload.c
diff --git a/vendored/libfuse/Makefile b/vendored/libfuse/Makefile
index 10117691..f0bbfc5d 100644
--- a/vendored/libfuse/Makefile
+++ b/vendored/libfuse/Makefile
@@ -133,13 +133,13 @@ $(BUILDDIR)/stamp:
 	$(MKDIR) -p $(BUILDDIR)/.objs/
 	$(TOUCH) $@
 
-$(BUILDDIR)/libfuse.a: $(OBJS)
+$(BUILDDIR)/libfuse.a: $(OBJS) | $(BUILDDIR)/stamp
 	$(AR) rcs $(BUILDDIR)/libfuse.a $(OBJS)
 
 .PHONY: utils
 utils: mergerfs-fusermount mount.mergerfs
 
-$(BUILDDIR)/mergerfs-fusermount: util/fusermount.cpp
+$(BUILDDIR)/mergerfs-fusermount: util/fusermount.cpp | $(BUILDDIR)/stamp
 	$(CXX) $(CXXFLAGS) $(FUSE_FLAGS) -Ilib -o $(BUILDDIR)/mergerfs-fusermount util/fusermount.cpp
 
 mergerfs-fusermount: $(BUILDDIR)/mergerfs-fusermount