aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPaolo \'Blaisorblade\' Giarrusso <blaisorblade_spam@yahoo.it>2004-09-02 02:08:21 +0200
committerTom Rini <trini@kernel.crashing.org>2004-09-02 02:08:21 +0200
commit969c4560c5fbc42b1f4cdafdf763483ce0d453a1 (patch)
tree26bf1882e11c8922a5b83a734aab2fe14ccdcf63 /Makefile
parent833245fc6c29669d4db2f0390abf119275d4f35f (diff)
downloadhistory-969c4560c5fbc42b1f4cdafdf763483ce0d453a1.tar.gz
kbuild: Set cflags before including arch Makefile
Please note that this patch, even if UML-related, should be immediately discussed for merging in mainline, if possible. The UML patch to handle this has therefore been separated. Patch purpose: If arch/$(ARCH)/Makefile is included before adding -O2 (and the rest) to CFLAGS, I must duplicate the addition of it to USER_CFLAGS for UML. So let's fix this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 87dd11554368c0..6bdccdc8e2d4da 100644
--- a/Makefile
+++ b/Makefile
@@ -456,15 +456,6 @@ else
include/linux/autoconf.h: ;
endif
-include $(srctree)/arch/$(ARCH)/Makefile
-
-# Default kernel image to build when no specific target is given.
-# KBUILD_IMAGE may be overruled on the commandline or
-# set in the environment
-# Also any assingments in arch/$(ARCH)/Makefiel take precedence over
-# this default value
-export KBUILD_IMAGE ?= vmlinux
-
# The all: target is the default when no target is given on the
# command line.
# This allow a user to issue only 'make' to build a kernel including modules
@@ -488,6 +479,15 @@ endif
# warn about C99 declaration after statement
CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
+include $(srctree)/arch/$(ARCH)/Makefile
+
+# Default kernel image to build when no specific target is given.
+# KBUILD_IMAGE may be overruled on the commandline or
+# set in the environment
+# Also any assingments in arch/$(ARCH)/Makefiel take precedence over
+# this default value
+export KBUILD_IMAGE ?= vmlinux
+
#
# INSTALL_PATH specifies where to place the updated kernel and system map
# images. Uncomment if you want to place them anywhere other than root.