summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-08 11:14:14 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-09 21:50:18 +0900
commit3fca1700c4c38aaec1cea0c143b0ff8da029fd9c (patch)
treee43ee2118739d7d4ce63dbfb60b665c90e917731 /Makefile
parent0004438a165b18d4a611745f12e328e65f46c8f2 (diff)
downloadlinux-stable-3fca1700c4c38aaec1cea0c143b0ff8da029fd9c.tar.gz
linux-stable-3fca1700c4c38aaec1cea0c143b0ff8da029fd9c.tar.bz2
linux-stable-3fca1700c4c38aaec1cea0c143b0ff8da029fd9c.zip
kbuild: make samples really depend on headers_install
Kernel headers must be installed into $(objtree)/usr/include to avoid the build failure of samples. Commit ddea05fa148b ("kbuild: make samples depend on headers_install") addressed this, but "samples/" is only used for the single target build. "make samples/" properly installs kernel headers, but it does not work for general building because a phony target "sample" (no trailing slash) is used. Reported-by: David Howells <dhowells@redhat.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d2832a45dffe..bb917de24913 100644
--- a/Makefile
+++ b/Makefile
@@ -1010,9 +1010,10 @@ ifdef CONFIG_GDB_SCRIPTS
endif
+$(call if_changed,link-vmlinux)
-# Build samples along the rest of the kernel
+# Build samples along the rest of the kernel. This needs headers_install.
ifdef CONFIG_SAMPLES
vmlinux-dirs += samples
+samples: headers_install
endif
# The actual objects are generated when descending,