Author: oxygene
Date: Sat Apr 17 01:01:34 2010
New Revision: 5454
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5454

Log:
Don't use $(ROMCC) as dependency (due to ccache and scanbuild support
modifying the variable for their own purposes)

Signed-off-by: Patrick Georgi <[email protected]>
Acked-by: Patrick Georgi <[email protected]>

Modified:
   trunk/src/arch/i386/Makefile.bootblock.inc
   trunk/src/arch/i386/Makefile.inc

Modified: trunk/src/arch/i386/Makefile.bootblock.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.bootblock.inc  Sat Apr 17 00:48:57 2010        
(r5453)
+++ trunk/src/arch/i386/Makefile.bootblock.inc  Sat Apr 17 01:01:34 2010        
(r5454)
@@ -65,7 +65,7 @@
        @printf "    CC         $(subst $(obj)/,,$(@))\n"
        $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include 
-I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h 
-I. -I$(src) $< -o $@
 
-$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst 
",,$(CONFIG_BOOTBLOCK_SOURCE)) $(ROMCC)
+$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst 
",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc
        @printf "    ROMCC      $(subst $(obj)/,,$(@))\n"
        $(CC) -MM -MT$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc \
                $< > $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc.d

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc    Sat Apr 17 00:48:57 2010        (r5453)
+++ trunk/src/arch/i386/Makefile.inc    Sat Apr 17 01:01:34 2010        (r5454)
@@ -164,7 +164,7 @@
 ifeq ($(CONFIG_ROMCC),y)
 ROMCCFLAGS ?= -mcpu=p2 -O2
 
-$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: 
$(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(ROMCC) $(OPTION_TABLE_H) 
$(obj)/build.h $(obj)/config.h
+$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: 
$(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(objutil)/romcc/romcc 
$(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h
        printf "    ROMCC      romstage.inc\n"
        $(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $< -o $@
 else

-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to