All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Michal Marek <mmarek@suse.com>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
	dri-devel@lists.freedesktop.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE
Date: Wed, 15 Jun 2016 17:45:45 +0200	[thread overview]
Message-ID: <20160615154553.3177021-4-arnd@arndb.de> (raw)
In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de>

When $(LINUXINCLUDE) is added to the cflags of a target that
normall doesn't have it (e.g. HOSTCFLAGS), each entry in the
list is expanded so that we search both $(objtree) and $(srctree),
which is a bit silly, as we already know which of the two we
want for each entry in LINUXINCLUDE.

Also, a follow-up patch changes the behavior so we only look in
$(srctree) for manually added include path, and that breaks finding
the generated headers.

This adds an explicit $(objtree) for each tree that we want to
look for generated files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 45159861e645..969924783543 100644
--- a/Makefile
+++ b/Makefile
@@ -377,19 +377,19 @@ CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE    := \
 		-I$(srctree)/arch/$(hdr-arch)/include/uapi \
-		-Iarch/$(hdr-arch)/include/generated/uapi \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
 		-I$(srctree)/include/uapi \
-		-Iinclude/generated/uapi \
+		-I$(objtree)/include/generated/uapi \
                 -include $(srctree)/include/linux/kconfig.h
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := \
 		-I$(srctree)/arch/$(hdr-arch)/include \
-		-Iarch/$(hdr-arch)/include/generated/uapi \
-		-Iarch/$(hdr-arch)/include/generated \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
-		-Iinclude
+		-I$(objtree)/include
 
 LINUXINCLUDE	+= $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
 
-- 
2.9.0

WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: Michal Marek <mmarek@suse.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	linux-kbuild@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE
Date: Wed, 15 Jun 2016 17:45:45 +0200	[thread overview]
Message-ID: <20160615154553.3177021-4-arnd@arndb.de> (raw)
In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de>

When $(LINUXINCLUDE) is added to the cflags of a target that
normall doesn't have it (e.g. HOSTCFLAGS), each entry in the
list is expanded so that we search both $(objtree) and $(srctree),
which is a bit silly, as we already know which of the two we
want for each entry in LINUXINCLUDE.

Also, a follow-up patch changes the behavior so we only look in
$(srctree) for manually added include path, and that breaks finding
the generated headers.

This adds an explicit $(objtree) for each tree that we want to
look for generated files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 45159861e645..969924783543 100644
--- a/Makefile
+++ b/Makefile
@@ -377,19 +377,19 @@ CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE    := \
 		-I$(srctree)/arch/$(hdr-arch)/include/uapi \
-		-Iarch/$(hdr-arch)/include/generated/uapi \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
 		-I$(srctree)/include/uapi \
-		-Iinclude/generated/uapi \
+		-I$(objtree)/include/generated/uapi \
                 -include $(srctree)/include/linux/kconfig.h
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := \
 		-I$(srctree)/arch/$(hdr-arch)/include \
-		-Iarch/$(hdr-arch)/include/generated/uapi \
-		-Iarch/$(hdr-arch)/include/generated \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
-		-Iinclude
+		-I$(objtree)/include
 
 LINUXINCLUDE	+= $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
 
-- 
2.9.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE
Date: Wed, 15 Jun 2016 17:45:45 +0200	[thread overview]
Message-ID: <20160615154553.3177021-4-arnd@arndb.de> (raw)
In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de>

When $(LINUXINCLUDE) is added to the cflags of a target that
normall doesn't have it (e.g. HOSTCFLAGS), each entry in the
list is expanded so that we search both $(objtree) and $(srctree),
which is a bit silly, as we already know which of the two we
want for each entry in LINUXINCLUDE.

Also, a follow-up patch changes the behavior so we only look in
$(srctree) for manually added include path, and that breaks finding
the generated headers.

This adds an explicit $(objtree) for each tree that we want to
look for generated files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 45159861e645..969924783543 100644
--- a/Makefile
+++ b/Makefile
@@ -377,19 +377,19 @@ CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE    := \
 		-I$(srctree)/arch/$(hdr-arch)/include/uapi \
-		-Iarch/$(hdr-arch)/include/generated/uapi \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
 		-I$(srctree)/include/uapi \
-		-Iinclude/generated/uapi \
+		-I$(objtree)/include/generated/uapi \
                 -include $(srctree)/include/linux/kconfig.h
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := \
 		-I$(srctree)/arch/$(hdr-arch)/include \
-		-Iarch/$(hdr-arch)/include/generated/uapi \
-		-Iarch/$(hdr-arch)/include/generated \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
+		-I$(objtree)/arch/$(hdr-arch)/include/generated \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
-		-Iinclude
+		-I$(objtree)/include
 
 LINUXINCLUDE	+= $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
 
-- 
2.9.0

  parent reply	other threads:[~2016-06-15 15:45 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 01/11] Kbuild: don't add ../../ to include path Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 02/11] Kbuild: avoid duplicate " Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` Arnd Bergmann [this message]
2016-06-15 15:45   ` [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 04/11] Kbuild: arch: look for generated headers in obtree Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-07-18 20:14   ` Michal Marek
2016-07-18 20:14     ` Michal Marek
2016-07-19  8:31     ` Arnd Bergmann
2016-07-19  8:31       ` Arnd Bergmann
2016-07-19  8:31       ` Arnd Bergmann
2016-07-19 14:33       ` Kalle Valo
2016-07-19 14:33         ` Kalle Valo
2016-07-19 15:38         ` Arnd Bergmann
2016-07-19 15:38           ` Arnd Bergmann
2016-07-19 15:38           ` Arnd Bergmann
2016-07-19 18:07           ` Kalle Valo
2016-07-19 18:07             ` Kalle Valo
2016-06-15 15:45 ` [PATCH v2 06/11] ARM: don't include removed directories Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 07/11] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 08/11] drm: amd: remove broken include path Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 09/11] net: skfb: remove obsolete -I cflag Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-16  5:06   ` David Miller
2016-06-16  5:06     ` David Miller
2016-06-15 15:45 ` [PATCH v2 10/11] rtlwifi: don't add include path for rtl8188ee Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 11/11] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default Arnd Bergmann
2016-06-15 15:45   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160615154553.3177021-4-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.