[PATCH] Makefile include path ordering

[PATCH] Makefile include path ordering

[Rik van Riel]

The arch Makefile may override the include path order, which is
used by Xen (and UML?) to make sure include/asm-xen is searched
before include/asm-i386.

The Makefile change to 2.6.12-rc4 made the top Makefile always
override the value specified by the arch Makefile.  This trivial
patch makes the Xen kernel compile again.

Signed-off-by: Rik van Riel <riel@redhat.com>

--- linux-2.6.11/Makefile.order	2005-05-16 16:20:20.000000000 -0400
+++ linux-2.6.11/Makefile	2005-05-16 16:21:30.000000000 -0400
@@ -530,7 +530,7 @@
 include $(srctree)/arch/$(ARCH)/Makefile
 
 # arch Makefile may override CC so keep this after arch Makefile is included
-NOSTDINC_FLAGS := -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
 CHECKFLAGS     += $(NOSTDINC_FLAGS)
 
 # warn about C99 declaration after statement

Re: [PATCH] Makefile include path ordering

[Sam Ravnborg]

On Mon, May 16, 2005 at 05:02:17PM -0400, Rik van Riel wrote:
> The arch Makefile may override the include path order, which is
> used by Xen (and UML?) to make sure include/asm-xen is searched
> before include/asm-i386.

gcc will respect the order of -I options assinged to CFLAGS
So adding xen support at the proper (topmost) place in
arch/i386/Makefile should satisfy this requirement.

Also playing with NOSTDINC_FLAGS will most likely break builds with O=
since kbuild does not mangle patchs specified with NOSTDINC

	Sam