diff mbox

[v7,7/8] kbuild: build sample modules along with the rest of the kernel

Message ID 1459284282-6676-8-git-send-email-nicolas.pitre@linaro.org
State Accepted
Commit dd92478a15fa3bfd746ee08b4ef59401c1537804
Headers show

Commit Message

Nicolas Pitre March 29, 2016, 8:44 p.m. UTC 
Make sample modules in parallel with the rest of the kernel rather
than having them built from the vmlinux target. This makes the build
slightly faster, and those modules are properly considered when
adjust_autoksyms.sh is executed.

Signed-off-by: Nicolas Pitre <nico@linaro.org>

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
2.5.5
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 9f93d2595d..cec9539d30 100644
--- a/Makefile
+++ b/Makefile
@@ -940,9 +940,6 @@  endif
 ifdef CONFIG_HEADERS_CHECK
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
-ifdef CONFIG_SAMPLES
-	$(Q)$(MAKE) $(build)=samples
-endif
 ifdef CONFIG_BUILD_DOCSRC
 	$(Q)$(MAKE) $(build)=Documentation
 endif
@@ -960,6 +957,11 @@  PHONY += autoksyms_recursive
 include/generated/autoksyms.h: FORCE
 	$(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh true
 
+# Build samples along the rest of the kernel
+ifdef CONFIG_SAMPLES
+vmlinux-dirs += samples
+endif
+
 # The actual objects are generated when descending,
 # make sure no implicit rule kicks in
 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;