summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-02-02 01:49:23 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2020-02-04 01:50:52 +0900
commitfaa7bdd7e9e1441ed82819b8db8bb43d3d3fd818 (patch)
tree84be5cd6c8cb0f95f6dd6fa5ff8a2f435e2e4825
parentc8fb7d7e48d11520ad24808cfce7afb7b9c9f798 (diff)
downloadlinux-stable-faa7bdd7e9e1441ed82819b8db8bb43d3d3fd818.tar.gz
linux-stable-faa7bdd7e9e1441ed82819b8db8bb43d3d3fd818.tar.bz2
linux-stable-faa7bdd7e9e1441ed82819b8db8bb43d3d3fd818.zip
kbuild: fix the document to use extra-y for vmlinux.lds
The difference between "always" and "extra-y" is that the targets listed in $(always) are always built, whereas the ones in $(extra-y) are built only when KBUILD_BUILTIN is set. So, "make modules" does not build the targets in $(extra-y). vmlinux.lds is only needed for linking vmlinux. So, adding it to extra-y is more correct. In fact, arch/x86/kernel/Makefile does this. Fix the example code. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r--Documentation/kbuild/makefiles.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/makefiles.rst
index d7e6534a8505..b1733b877025 100644
--- a/Documentation/kbuild/makefiles.rst
+++ b/Documentation/kbuild/makefiles.rst
@@ -1269,12 +1269,12 @@ When kbuild executes, the following steps are followed (roughly):
Example::
#arch/x86/kernel/Makefile
- always := vmlinux.lds
+ extra-y := vmlinux.lds
#Makefile
export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
- The assignment to $(always) is used to tell kbuild to build the
+ The assignment to extra-y is used to tell kbuild to build the
target vmlinux.lds.
The assignment to $(CPPFLAGS_vmlinux.lds) tells kbuild to use the
specified options when building the target vmlinux.lds.