Fix race condition building dependencies with multithreaded builds
Former-commit-id: 04679b3b3b53c87c85c2d64c9f6d34a73969af2c
This commit is contained in:
parent
d80f576f77
commit
9c5fcadc5f
10
src/Makefile
10
src/Makefile
@ -233,17 +233,15 @@ persist-settings: distclean
|
|||||||
.PHONY: persist-settings
|
.PHONY: persist-settings
|
||||||
|
|
||||||
# Prerequisites target
|
# Prerequisites target
|
||||||
.make-prerequisites:
|
|
||||||
@touch $@
|
|
||||||
|
|
||||||
# Clean everything, persist settings and build dependencies if anything changed
|
# Clean everything, persist settings and build dependencies if anything changed
|
||||||
ifneq ($(strip $(PREV_FINAL_CFLAGS)), $(strip $(FINAL_CFLAGS)))
|
ifneq ($(strip $(PREV_FINAL_CFLAGS)), $(strip $(FINAL_CFLAGS)))
|
||||||
.make-prerequisites: persist-settings
|
.make-prerequisites: persist-settings
|
||||||
endif
|
else ifneq ($(strip $(PREV_FINAL_LDFLAGS)), $(strip $(FINAL_LDFLAGS)))
|
||||||
|
|
||||||
ifneq ($(strip $(PREV_FINAL_LDFLAGS)), $(strip $(FINAL_LDFLAGS)))
|
|
||||||
.make-prerequisites: persist-settings
|
.make-prerequisites: persist-settings
|
||||||
|
else
|
||||||
|
.make-prerequisites:
|
||||||
endif
|
endif
|
||||||
|
@touch $@
|
||||||
|
|
||||||
# keydb-server
|
# keydb-server
|
||||||
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
|
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user