[Minios-devel] [UNIKRAFT PATCH] build: Include Makefile.rules after .config is loaded

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Includes `support/build/Makefile.rules` still before the build system
installs any build rule but after a configuration (`.config`) was
loaded and after the tools variables were defined.
This change re-enables the correct behavior of helper functions that
depend on these items being populated. For example `build_cmd`: The
option to record build statistics depends on the configuration variable
`CONFIG_RECORD_BUILDTIME`.

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 62b0b651..d8bf0700 100644
--- a/Makefile
+++ b/Makefile
@@ -186,9 +186,6 @@ TOUCH := touch
 CONFIG_SHELL := $(SHELL)
 export SHELL CONFIG_SHELL Q KBUILD_VERBOSE
 
-# Include common Makefile helpers early
-include $(CONFIG_UK_BASE)/support/build/Makefile.rules
-
 
################################################################################
 # .config
 
################################################################################
@@ -313,6 +310,13 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 
2>&1 | \
 export HOSTAR HOSTAS HOSTCC HOSTCC_VERSION HOSTCXX HOSTLD HOSTARCH
 export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 
+################################################################################
+# Makefile helpers
+################################################################################
+# We need to include this file early (before any rule is defined)
+# but after we have tried to load a .config and after having our tools defined
+include $(CONFIG_UK_BASE)/support/build/Makefile.rules
+
 
################################################################################
 # Clean targets that do not have any dependency on a configuration
 
################################################################################
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel