From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 15 Jun 2016 15:45:44 +0000 (+0200)
Subject: Kbuild: avoid duplicate include path
X-Git-Tag: v4.8-rc1~59^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dc33db7c338e1a7a4a7cb94d73745c8ca54b1ac8;p=linux.git

Kbuild: avoid duplicate include path

arch/$(hdr-arch)/include/generated/uapi is included twice in the
header search path, which is unnecessary, so this changes the
top-level Makefile to drop the second instance by filtering out
everything from USERINCLUDE that was already part of LINUXINCLUDE.

This should have very little effect other than making the 'make V=1'
output slightly smaller and making the build time faster by a miniscule
amount, but it seems to be cleaner.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Michal Marek <mmarek@suse.com>
---

diff --git a/Makefile b/Makefile
index c3d494ba3ae1..337686db5fd3 100644
--- a/Makefile
+++ b/Makefile
@@ -387,8 +387,9 @@ LINUXINCLUDE    := \
 		-Iarch/$(hdr-arch)/include/generated/uapi \
 		-Iarch/$(hdr-arch)/include/generated \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
-		-Iinclude \
-		$(USERINCLUDE)
+		-Iinclude
+
+LINUXINCLUDE	+= $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
 
 KBUILD_CPPFLAGS := -D__KERNEL__