[PATCH] kbuild: remove duplicated arch/*/include/generated/uapi include path

[PATCH] kbuild: remove duplicated arch/*/include/generated/uapi include path

[Masahiro Yamada]

Commit 90ac086bca10 ("Makefile: include arch/*/include/generated/uapi
before .../generated") introduced this for bisect'ability.  The commit
chose to promote arch/*/include/generated/uapi in the search path
rather than cleaning stale headers.

After all, we found that approach was not enough, and ended up with
cleaning stale headers by commit cda2c65f981d ("kbuild: Remove stale
asm-generic wrappers").

So, the extra search path is no longer needed because Kbuild invokes
scripts/Makefile.asm-generic and remove stale headers before it starts
descending.

This commit is also reverting commit dc33db7c338e ("Kbuild: avoid
duplicate include path") because we have no more duplicated path.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 813ee12431b6..c2c212264752 100644
--- a/Makefile
+++ b/Makefile
@@ -387,12 +387,10 @@ USERINCLUDE    := \
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := \
 		-I$(srctree)/arch/$(hdr-arch)/include \
-		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
 		-I$(objtree)/arch/$(hdr-arch)/include/generated \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
-		-I$(objtree)/include
-
-LINUXINCLUDE	+= $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
+		-I$(objtree)/include \
+		$(USERINCLUDE)
 
 KBUILD_CPPFLAGS := -D__KERNEL__
 
-- 
2.7.4

Re: [PATCH] kbuild: remove duplicated arch/*/include/generated/uapi include path

[Masahiro Yamada]

2017-06-06 16:15 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Commit 90ac086bca10 ("Makefile: include arch/*/include/generated/uapi
> before .../generated") introduced this for bisect'ability.  The commit
> chose to promote arch/*/include/generated/uapi in the search path
> rather than cleaning stale headers.
>
> After all, we found that approach was not enough, and ended up with
> cleaning stale headers by commit cda2c65f981d ("kbuild: Remove stale
> asm-generic wrappers").
>
> So, the extra search path is no longer needed because Kbuild invokes
> scripts/Makefile.asm-generic and remove stale headers before it starts
> descending.
>
> This commit is also reverting commit dc33db7c338e ("Kbuild: avoid
> duplicate include path") because we have no more duplicated path.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>


Applied to linux-kbuild/kbuild.



-- 
Best Regards
Masahiro Yamada