summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2020-01-16 12:33:26 -0800
committerJens Axboe <axboe@kernel.dk>2020-01-16 13:33:59 -0700
commitf4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc (patch)
treea485cffc0fd78c6fb0846c4d63cf5e2fa4670049
parent9c73da91540b27adaaf56065629e831cc50c5a3d (diff)
downloadblktrace-f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc.tar.gz
blktrace-f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc.tar.bz2
fix parallel build of btt and blkiomon
rbtree.c is used by both binaries. It is possible that when make -C btt is invoked rbtree.o does not exist yet, but is already schedule by the compilation of blkiomon. That could result in recompiling rbtree.o again for btt/btt. In that case, at install time, make will recompile blkiomon which can fail in gentoo, because CC variable is not overriden by ebuild script at install time. (see https://bugs.gentoo.org/705594) Add a dependency on SUBDIRS to wait for all binary in . to be compiled. It will guarante rbtree.o exists. Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5917814..eb3c6a1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ all: $(ALL) $(SUBDIRS)
# We always descend into subdirs because they contain their own dependency
# information which we don't track in this top level Makefile.
-$(SUBDIRS):
+$(SUBDIRS): $(PROGS)
$(MAKE) -C $@
.PHONY: $(SUBDIRS)