aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2019-10-07 16:49:35 +0100
committerBen Hutchings <ben@decadent.org.uk>2019-10-07 17:25:17 +0100
commit5b7689f66c4476432ebe8fe8a88ea9fdeaa4eba8 (patch)
tree07c6c28efced2e2696e87a6a8ae70082ee1876f8
parent17e0df3e79cdb5c68d29af5c742cd691f45a4781 (diff)
downloadklibc-5b7689f66c4476432ebe8fe8a88ea9fdeaa4eba8.tar.gz
[klibc] Fix missing header dependency for sigsuspend.o
sigsuspend.c includes <klibc/havesyscall.h>, which is a generated file. In a parallel make, sigsuspend.o might currently be built before havesyscall.h, and to avoid this we need t add an explicit dependency. Given that they are built from different makefiles, I don't think a direct dependency will work. Instead, add syscalls/klib.list as a dependency for sigsuspend.o so that it indirectly depends on everything that's built from syscalls/. Reported-by: Matthias Klose <doko@ubuntu.com> Reported-by: Thorsten Glaser <tg@mirbsd.de> References: https://bugs.launchpad.net/ubuntu/+source/klibc/+bug/1843743 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--usr/klibc/Kbuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
index 526442dc0ba43..b462fbecdce15 100644
--- a/usr/klibc/Kbuild
+++ b/usr/klibc/Kbuild
@@ -83,6 +83,10 @@ ifeq ($(CONFIG_KLIBC_ERRLIST),y)
KLIBCCFLAGS_strerror.o += -DWITH_ERRLIST
endif
+# sigsuspend.c includes <klibc/havesyscall.h> generated by syscalls/
+# build, so require that to build first
+$(obj)/sigsuspend.o: $(obj)/syscalls/klib.list
+
#####
# Shared definitions
LIBC := libc.a