aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRik van Riel <riel@redhat.com>2005-05-17 00:53:46 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 10:59:19 -0400
commite8f5bdb02ce06925e7fc5916125bdebc533d4299 (patch)
treee9baf463f7058f658c63823cf6019bd7317b82cf /Makefile
parent631330afdf9d29fe84526653674e8e061389d8f6 (diff)
[PATCH] Makefile include path ordering
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> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bddcb861b49b..1bb028317f2b 100644
--- a/Makefile
+++ b/Makefile
@@ -530,7 +530,7 @@ endif
530include $(srctree)/arch/$(ARCH)/Makefile 530include $(srctree)/arch/$(ARCH)/Makefile
531 531
532# arch Makefile may override CC so keep this after arch Makefile is included 532# arch Makefile may override CC so keep this after arch Makefile is included
533NOSTDINC_FLAGS := -nostdinc -isystem $(shell $(CC) -print-file-name=include) 533NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
534CHECKFLAGS += $(NOSTDINC_FLAGS) 534CHECKFLAGS += $(NOSTDINC_FLAGS)
535 535
536# warn about C99 declaration after statement 536# warn about C99 declaration after statement