Skip to content

Commit 4ee5d9b

Browse files
committed
lkl: fix hijack and zpoline parallel builds
This is a follow up change for commit 3c97822 ("lkl: add tests build barrier") tracked via #558. The hijack and zpoline libraries also share object files, so need a barrier to avoid parallel build failures. Signed-off-by: David Disseldorp <[email protected]>
1 parent 46f599b commit 4ee5d9b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

tools/lkl/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,11 @@ headers_install: $(TARGETS)
176176
include/lkl_config.h $(DESTDIR)$(INCDIR) ; \
177177
cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR)
178178

179-
libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a
180-
$(call QUIET_INSTALL, libraries) \
179+
libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a
180+
# filter out special .WAIT targets from install
181+
$(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \
181182
install -d $(DESTDIR)$(LIBDIR) ; \
182-
install -m 644 $^ $(DESTDIR)$(LIBDIR)
183+
install -m 644 $^ $(DESTDIR)$(LIBDIR))
183184

184185
programs_install: $(call expand-targets,$(progs-y),$(EXESUF))
185186
$(call QUIET_INSTALL, programs) \

tools/lkl/Targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ libs-y += lib/liblkl
22

33
ifneq ($(LKL_HOST_CONFIG_BSD),y)
44
libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack
5+
# hijack and zpoline targets share object files, breaking parallel builds
6+
libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT
57
libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline
68
endif
79
LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs

0 commit comments

Comments
 (0)