From 3a8384bc40c263acca12af28910bf2c80061833e Mon Sep 17 00:00:00 2001
From: Florian Larysch <fl@n621.de>
Date: Wed, 14 Jun 2023 16:42:02 +0200
Subject: [PATCH] linux: make kconfig depend on host-make
Commit 0b9efc991f ("linux: use BR2_MAKE") switched LINUX_MAKE to
$(BR2_MAKE). However, this also implicitly sets LINUX_KCONFIG_MAKE.
Thus, when host-make is being used in a build that has
PER_PACKAGE_DIRECTORIES enabled, the dotconfig step will try to use the
make instance from the host directory, but since it is not listed in
LINUX_KCONFIG_DEPENDENCIES, it won't be available yet at that point in
time.
Add an explicit dependency to LINUX_KCONFIG_DEPENDENCIES to have it
copied over early enough.
Signed-off-by: Florian Larysch <fl@n621.de>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 66681bd4a6b9faadf9a6f772efb2705b06084cfc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
linux/linux.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index cc36b5251d..1c4fe45ac9 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -88,7 +88,8 @@ LINUX_DEPENDENCIES += \
# only if the host does not have them.
LINUX_KCONFIG_DEPENDENCIES = \
$(BR2_BISON_HOST_DEPENDENCY) \
- $(BR2_FLEX_HOST_DEPENDENCY)
+ $(BR2_FLEX_HOST_DEPENDENCY) \
+ $(BR2_MAKE_HOST_DEPENDENCY)
# Starting with 4.18, the kconfig in the kernel calls the
# cross-compiler to check its capabilities. So we need the