diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile index 9ca22b7605e3ad..dfe7f6aef5fe02 100644 --- a/tools/lkl/Makefile +++ b/tools/lkl/Makefile @@ -176,10 +176,11 @@ headers_install: $(TARGETS) include/lkl_config.h $(DESTDIR)$(INCDIR) ; \ cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR) -libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a - $(call QUIET_INSTALL, libraries) \ +libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a + # filter out special .WAIT targets from install + $(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \ install -d $(DESTDIR)$(LIBDIR) ; \ - install -m 644 $^ $(DESTDIR)$(LIBDIR) + install -m 644 $^ $(DESTDIR)$(LIBDIR)) programs_install: $(call expand-targets,$(progs-y),$(EXESUF)) $(call QUIET_INSTALL, programs) \ diff --git a/tools/lkl/Targets b/tools/lkl/Targets index 3d30bd8be3c840..089a832ee23627 100644 --- a/tools/lkl/Targets +++ b/tools/lkl/Targets @@ -2,6 +2,8 @@ libs-y += lib/liblkl ifneq ($(LKL_HOST_CONFIG_BSD),y) libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack +# hijack and zpoline targets share object files, breaking parallel builds +libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline endif LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs