From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S268916AbUH3Ty7 (ORCPT ); Mon, 30 Aug 2004 15:54:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S268907AbUH3Tya (ORCPT ); Mon, 30 Aug 2004 15:54:30 -0400 Received: from ppp-62-11-78-150.dialup.tiscali.it ([62.11.78.150]:7042 "EHLO zion.localdomain") by vger.kernel.org with ESMTP id S268883AbUH3Twj (ORCPT ); Mon, 30 Aug 2004 15:52:39 -0400 Subject: [patch 2/2] Set-cflags-before-including-arch-Makefile To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, blaisorblade_spam@yahoo.it From: blaisorblade_spam@yahoo.it Date: Mon, 30 Aug 2004 21:48:38 +0200 Message-Id: <20040830194838.3F2B37D87@zion.localdomain> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- uml-linux-2.6.8.1-paolo/Makefile | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff -puN Makefile~Set-cflags-before-including-arch-Makefile Makefile --- uml-linux-2.6.8.1/Makefile~Set-cflags-before-including-arch-Makefile 2004-08-29 14:40:49.665661448 +0200 +++ uml-linux-2.6.8.1-paolo/Makefile 2004-08-29 14:40:49.668660992 +0200 @@ -428,15 +428,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 @@ -460,6 +451,15 @@ endif # warn about C99 declaration after statement CFLAGS += $(call check_gcc,-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. _