Skip to content

lkl: fix hijack and zpoline parallel builds #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

lkl: fix hijack and zpoline parallel builds #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tools/lkl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 2 additions & 0 deletions tools/lkl/Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading