2004-10-27 23:22:22

by Randolph Chung

Subject: [patch/Makefile] Fix cc-option call for xcompiles

If an arch Makefile overrides CROSS_COMPILE (e.g. parisc, mips, ...)
then the cc-option call in the main Makefile uses the wrong compiler
to check for options.

Signed-off-by: Randolph Chung <[email protected]>

Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.281
diff -u -p -r1.281 Makefile
--- Makefile 27 Oct 2004 21:23:19 -0000 1.281
+++ Makefile 27 Oct 2004 23:16:30 -0000
@@ -494,10 +494,10 @@ ifdef CONFIG_DEBUG_INFO
CFLAGS += -g
endif

+include $(srctree)/arch/$(ARCH)/Makefile
+
# 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

--
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/

2004-10-28 01:17:10

by Linus Torvalds

Subject: Re: [patch/Makefile] Fix cc-option call for xcompiles

On Wed, 27 Oct 2004, Randolph Chung wrote:
>
> Signed-off-by: Randolph Chung <[email protected]>
>
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/linux-2.6/Makefile,v
> retrieving revision 1.281
> diff -u -p -r1.281 Makefile
> --- Makefile 27 Oct 2004 21:23:19 -0000 1.281

Can you please make your patches be -p1 based? With CVS, I think just
using "cvs diff -u ." should do it.

Otherwise I'll have to edit the patch to make it work with the tools (not
a big deal for a single file diff, but..)

Linus

2004-10-28 05:18:23

by Randolph Chung

Subject: Re: [patch/Makefile] Fix cc-option call for xcompiles

> Can you please make your patches be -p1 based? With CVS, I think just
> using "cvs diff -u ." should do it.

well, cvs diff is what i use... but ok, i'll make it -p1...

Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.281
diff -u -p -r1.281 Makefile
--- linux-2.6/Makefile 27 Oct 2004 21:23:19 -0000 1.281
+++ linux-2.6/Makefile 27 Oct 2004 23:16:30 -0000
@@ -494,10 +494,10 @@ ifdef CONFIG_DEBUG_INFO
CFLAGS += -g
endif

+include $(srctree)/arch/$(ARCH)/Makefile
+
# 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
--
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/