Skip to content

Commit 5d913cd

Browse files
committed
build(make): fix parallel build ordering with wrapper deps;
After switching to goal-specific wrappers, the old subdir deps no longer applied. Express the ordering between wrapper targets and ensure the core builds before modules: - all-nsd: | all-nsthread (core chain) - $(SUBDIRS_MODS:%=all-%): | all-nsd (modules after core) - all-nsdbtest: | all-nsdb (specific extra) Also make install depend on all so installation only runs after a successful build.
1 parent a4233cf commit 5d913cd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ test-%:
6868
+$(MAKE) $(SUBMAKE_J) -C $* test
6969

7070
# Subdir dependencies
71-
nsd: nsthread
71+
all-nsd: | all-nsthread
7272

7373
# modules depend on core
74-
$(SUBDIRS_MODS): nsd
74+
$(SUBDIRS_MODS:%=all-%): | all-nsd
7575

7676
# specific extras
77-
nsdbtest: nsdb
78-
#quic: nsssl
77+
all-nsdbtest: | all-nsdb
78+
#quic: | all-nsssl
7979

8080
ifneq ($(strip $(PEM_FILE)),)
8181
all: $(PEM_FILE)
@@ -103,7 +103,7 @@ help:
103103
@echo ' make gdbtest TESTFLAGS="-verbose start -file cookies.test -match cookie-2.*"'
104104
@echo
105105

106-
install: install-dirs install-include install-tcl install-modules \
106+
install: all install-dirs install-include install-tcl install-modules \
107107
install-config install-certificates install-doc install-examples install-notice
108108

109109
HAVE_NSADMIN := $(shell id -u nsadmin 2> /dev/null)

0 commit comments

Comments
 (0)