Skip to content

Commit 310bec7

Browse files
committed
Squash build races between dmalloc.h and .o files
This change modifies the object code to depend on dmalloc.h as it's generated over the course of the build. This unbreaks parallel builds (-j greater than 1). NB: technically all of the local header dependencies should be fully mapped to their .o files to ensure that the .o files are properly rebuilt when the headers are modified, but this covers the core concurrent build issue that was occurring prior to this change. Closes: #119 Co-authored-by: Bryan Drewery <[email protected]> Signed-off-by: Enji Cooper <[email protected]>
1 parent 2fca29a commit 310bec7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Makefile.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ NORMAL_OBJS = chunk.o error.o user_malloc.o
154154
THREAD_OBJS = chunk_th.o error_th.o user_malloc_th.o
155155
CXX_OBJS = dmallocc.o
156156

157+
$(OBJS) $(NORMAL_OBJS) $(THREAD_OBJS) $(CXX_OBJS): dmalloc.h
158+
157159
CFLAGS = $(CCFLAGS)
158160
TEST = $(MODULE)_t
159161
TEST_FC = $(MODULE)_fc_t

0 commit comments

Comments
 (0)