Skip to content

Commit 8a0c5f4

Browse files
committed
build(make): move nsproxy (Unix-only) into SUBDIRS_MODS to inherit core deps
nsproxy is now appended to SUBDIRS_MODS (under the existing Unix-only guard) instead of to SUBDIRS. This makes it follow the same ordering rules as the other modules (e.g., "modules after nsd"), avoiding races where nsproxy could link before nsd finished—seen on GitHub runners as intermittent collect2: error: ld returned 1 exit status while building libnsproxy.so.
1 parent e0974f1 commit 8a0c5f4

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ include include/Makefile.global
1919
# Subdirectories
2020
SUBDIRS_CORE := nsthread nsd
2121
SUBDIRS_MODS := nssock nscgi nscp nslog nsperm nsdb nsssl quic revproxy nsdbtest
22+
# Unix only modules
23+
ifeq (,$(findstring MINGW,$(uname)))
24+
SUBDIRS_MODS += nsproxy
25+
endif
2226
SUBDIRS := $(SUBDIRS_CORE) $(SUBDIRS_MODS)
2327

2428
#
@@ -39,11 +43,6 @@ else ifeq ($(strip $(USER_SET_J)$(HAS_JOBSERVER)),)
3943
endif
4044
endif
4145

42-
# Unix only modules
43-
ifeq (,$(findstring MINGW,$(uname)))
44-
SUBDIRS += nsproxy
45-
endif
46-
4746
distfiles = $(SUBDIRS) doc tcl contrib include tests win win32 configure m4 \
4847
Makefile autogen.sh install-sh missing aclocal.m4 configure.ac \
4948
config.guess config.sub \

0 commit comments

Comments
 (0)