From 4896623be2adf20f5ce487138317bb9c8966b7b4 Mon Sep 17 00:00:00 2001 From: Abdelatif Guettouche Date: Mon, 23 May 2022 21:43:05 +0200 Subject: [PATCH] build: Fix dependencies of kernel targets. Targets build during the kernel phase did not have their dependencies specified and thus they were not rebuilt after their dependencies have changed, for example by changing options in menuconfig. Signed-off-by: Abdelatif Guettouche --- libs/libc/Makefile | 4 ++-- libs/libnx/Makefile | 4 ++-- mm/Makefile | 4 ++-- tools/LibTargets.mk | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/libc/Makefile b/libs/libc/Makefile index b97ef2ac084..a94d4a97bf0 100644 --- a/libs/libc/Makefile +++ b/libs/libc/Makefile @@ -144,8 +144,8 @@ endif # C library for the kernel phase of the two-pass kernel build ifneq ($(BIN),$(KBIN)) -$(KBIN): - $(Q) $(MAKE) $(KBIN) BIN=$(KBIN) BINDIR=kbin EXTRAFLAGS="$(EXTRAFLAGS)" +$(KBIN): $(OBJS) + $(Q) $(MAKE) $(KBIN) BIN=$(KBIN) EXTRAFLAGS="$(EXTRAFLAGS)" endif # Context diff --git a/libs/libnx/Makefile b/libs/libnx/Makefile index 263c399d482..81a36263e0c 100644 --- a/libs/libnx/Makefile +++ b/libs/libnx/Makefile @@ -214,8 +214,8 @@ $(BIN): $(OBJS) # NX library for the kernel phase of the two-pass kernel build ifneq ($(BIN),$(KBIN)) -$(KBIN): - $(Q) $(MAKE) $(KBIN) BIN=$(KBIN) BINDIR=kbin EXTRAFLAGS="$(EXTRAFLAGS)" +$(KBIN): $(OBJS) + $(Q) $(MAKE) $(KBIN) BIN=$(KBIN) EXTRAFLAGS="$(EXTRAFLAGS)" endif # Dependencies diff --git a/mm/Makefile b/mm/Makefile index 323a8ed33c2..c34f5e1ba69 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -62,8 +62,8 @@ $(BIN): $(OBJS) # Memory manager for the kernel phase of the two-pass kernel build ifneq ($(BIN),$(KBIN)) -$(KBIN): - $(Q) $(MAKE) $(KBIN) BIN=$(KBIN) BINDIR=kbin EXTRAFLAGS="$(EXTRAFLAGS)" +$(KBIN): $(OBJS) + $(Q) $(MAKE) $(KBIN) BIN=$(KBIN) EXTRAFLAGS="$(EXTRAFLAGS)" endif # Dependencies diff --git a/tools/LibTargets.mk b/tools/LibTargets.mk index 06d1f3db722..1d49e9b6f04 100644 --- a/tools/LibTargets.mk +++ b/tools/LibTargets.mk @@ -26,19 +26,19 @@ # Possible kernel-mode builds libs$(DELIM)libc$(DELIM)libkc$(LIBEXT): pass2dep - $(Q) $(MAKE) -C libs$(DELIM)libc libkc$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" + $(Q) $(MAKE) -C libs$(DELIM)libc libkc$(LIBEXT) BINDIR=kbin EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" staging$(DELIM)libkc$(LIBEXT): libs$(DELIM)libc$(DELIM)libkc$(LIBEXT) $(Q) $(call INSTALL_LIB,$<,$@) libs$(DELIM)libnx$(DELIM)libknx$(LIBEXT): pass2dep - $(Q) $(MAKE) -C libs$(DELIM)libnx libknx$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" + $(Q) $(MAKE) -C libs$(DELIM)libnx libknx$(LIBEXT) BINDIR=kbin EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" staging$(DELIM)libknx$(LIBEXT): libs$(DELIM)libnx$(DELIM)libknx$(LIBEXT) $(Q) $(call INSTALL_LIB,$<,$@) mm$(DELIM)libkmm$(LIBEXT): pass2dep - $(Q) $(MAKE) -C mm libkmm$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" + $(Q) $(MAKE) -C mm libkmm$(LIBEXT) BINDIR=kbin EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" staging$(DELIM)libkmm$(LIBEXT): mm$(DELIM)libkmm$(LIBEXT) $(Q) $(call INSTALL_LIB,$<,$@)