mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
kbuild: use $(src) instead of $(srctree)/$(src) for source directory
Kbuild conventionally uses $(obj)/ for generated files, and $(src)/ for
checked-in source files. It is merely a convention without any functional
difference. In fact, $(obj) and $(src) are exactly the same, as defined
in scripts/Makefile.build:
src := $(obj)
When the kernel is built in a separate output directory, $(src) does
not accurately reflect the source directory location. While Kbuild
resolves this discrepancy by specifying VPATH=$(srctree) to search for
source files, it does not cover all cases. For example, when adding a
header search path for local headers, -I$(srctree)/$(src) is typically
passed to the compiler.
This introduces inconsistency between upstream and downstream Makefiles
because $(src) is used instead of $(srctree)/$(src) for the latter.
To address this inconsistency, this commit changes the semantics of
$(src) so that it always points to the directory in the source tree.
Going forward, the variables used in Makefiles will have the following
meanings:
$(obj) - directory in the object tree
$(src) - directory in the source tree (changed by this commit)
$(objtree) - the top of the kernel object tree
$(srctree) - the top of the kernel source tree
Consequently, $(srctree)/$(src) in upstream Makefiles need to be replaced
with $(src).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
This commit is contained in:
@@ -18,13 +18,13 @@ ifdef REGENERATE_UTF8DATA
|
||||
|
||||
quiet_cmd_utf8data = GEN $@
|
||||
cmd_utf8data = $< \
|
||||
-a $(srctree)/$(src)/DerivedAge.txt \
|
||||
-c $(srctree)/$(src)/DerivedCombiningClass.txt \
|
||||
-p $(srctree)/$(src)/DerivedCoreProperties.txt \
|
||||
-d $(srctree)/$(src)/UnicodeData.txt \
|
||||
-f $(srctree)/$(src)/CaseFolding.txt \
|
||||
-n $(srctree)/$(src)/NormalizationCorrections.txt \
|
||||
-t $(srctree)/$(src)/NormalizationTest.txt \
|
||||
-a $(src)/DerivedAge.txt \
|
||||
-c $(src)/DerivedCombiningClass.txt \
|
||||
-p $(src)/DerivedCoreProperties.txt \
|
||||
-d $(src)/UnicodeData.txt \
|
||||
-f $(src)/CaseFolding.txt \
|
||||
-n $(src)/NormalizationCorrections.txt \
|
||||
-t $(src)/NormalizationTest.txt \
|
||||
-o $@
|
||||
|
||||
$(obj)/utf8data.c: $(obj)/mkutf8data $(filter %.txt, $(cmd_utf8data)) FORCE
|
||||
|
||||
Reference in New Issue
Block a user