GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make $(obj)/build.h an explicit dependency for all 

object files, as it's dragged into the build by
-include $(obj)/build.h for pretty much everything.

Also, generate build.h atomically.

This fixes parallel build with kconfig on my box.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5062 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2010-01-29 17:38:57 +00:00
parent 24ddfd4b7d
commit cccbb898e2
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@ -140,7 +140,7 @@ $(eval $(call evaluate_subdirs))
define c_dsl_template define c_dsl_template
$(obj)/$(1)%.c: src/$(1)%.dsl $(obj)/$(1)%.c: src/$(1)%.dsl $(obj)/build.h
@printf " IASL $$(subst $$(shell pwd)/,,$$(@))\n" @printf " IASL $$(subst $$(shell pwd)/,,$$(@))\n"
iasl -p $$(basename $$@) -tc $$< iasl -p $$(basename $$@) -tc $$<
perl -pi -e 's/AmlCode/AmlCode_$$(notdir $$(basename $$@))/g' $$(basename $$@).hex perl -pi -e 's/AmlCode/AmlCode_$$(notdir $$(basename $$@))/g' $$(basename $$@).hex
@ -148,31 +148,31 @@ $(obj)/$(1)%.c: src/$(1)%.dsl
endef endef
define objs_c_template define objs_c_template
$(obj)/$(1)%.o: src/$(1)%.c $(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h
@printf " CC $$(subst $$(obj)/,,$$(@))\n" @printf " CC $$(subst $$(obj)/,,$$(@))\n"
$(CC) -m32 $$(CFLAGS) -c -o $$@ $$< $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
endef endef
define objs_S_template define objs_S_template
$(obj)/$(1)%.o: src/$(1)%.S $(obj)/$(1)%.o: src/$(1)%.S $(obj)/build.h
@printf " CC $$(subst $$(obj)/,,$$(@))\n" @printf " CC $$(subst $$(obj)/,,$$(@))\n"
$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$< $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
endef endef
define initobjs_c_template define initobjs_c_template
$(obj)/$(1)%.o: src/$(1)%.c $(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h
@printf " CC $$(subst $$(obj)/,,$$(@))\n" @printf " CC $$(subst $$(obj)/,,$$(@))\n"
$(CC) -m32 $$(CFLAGS) -c -o $$@ $$< $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
endef endef
define initobjs_S_template define initobjs_S_template
$(obj)/$(1)%.o: src/$(1)%.S $(obj)/$(1)%.o: src/$(1)%.S $(obj)/build.h
@printf " CC $$(subst $$(obj)/,,$$(@))\n" @printf " CC $$(subst $$(obj)/,,$$(@))\n"
$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$< $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
endef endef
define drivers_c_template define drivers_c_template
$(obj)/$(1)%.o: src/$(1)%.c $(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h
@printf " CC $$(subst $$(obj)/,,$$(@))\n" @printf " CC $$(subst $$(obj)/,,$$(@))\n"
$(CC) -m32 $$(CFLAGS) -c -o $$@ $$< $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
endef endef
@ -257,20 +257,24 @@ prepare:
mkdir -p $(obj)/util/kconfig/lxdialog mkdir -p $(obj)/util/kconfig/lxdialog
test -n "$(alldirs)" && mkdir -p $(alldirs) || true test -n "$(alldirs)" && mkdir -p $(alldirs) || true
prepare2: prepare2: $(obj)/build.h
$(obj)/build.h:
@printf " GEN build.h\n" @printf " GEN build.h\n"
printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.h rm -f $(obj)/build.h
printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.h printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.ht
printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.h printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.ht
printf "\n" >> $(obj)/build.h printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.ht
printf "#define COREBOOT_COMPILER \"$(shell LANG= $(CC) --version | head -n1)\"\n" >> $(obj)/build.h printf "\n" >> $(obj)/build.ht
printf "#define COREBOOT_ASSEMBLER \"$(shell LANG= $(AS) --version | head -n1)\"\n" >> $(obj)/build.h printf "#define COREBOOT_COMPILER \"$(shell LANG= $(CC) --version | head -n1)\"\n" >> $(obj)/build.ht
printf "#define COREBOOT_LINKER \"$(shell LANG= $(LD) --version | head -n1)\"\n" >> $(obj)/build.h printf "#define COREBOOT_ASSEMBLER \"$(shell LANG= $(AS) --version | head -n1)\"\n" >> $(obj)/build.ht
printf "#define COREBOOT_COMPILE_TIME \"`LANG= date +%T`\"\n" >> $(obj)/build.h printf "#define COREBOOT_LINKER \"$(shell LANG= $(LD) --version | head -n1)\"\n" >> $(obj)/build.ht
printf "#define COREBOOT_COMPILE_BY \"$(shell PATH=$$PATH:/usr/ucb whoami)\"\n" >> $(obj)/build.h printf "#define COREBOOT_COMPILE_TIME \"`LANG= date +%T`\"\n" >> $(obj)/build.ht
printf "#define COREBOOT_COMPILE_HOST \"$(shell hostname)\"\n" >> $(obj)/build.h printf "#define COREBOOT_COMPILE_BY \"$(subst \,@,$(shell PATH=$$PATH:/usr/ucb whoami))\"\n" >> $(obj)/build.ht
printf "#define COREBOOT_COMPILE_DOMAIN \"$(shell test `uname -s` = "Linux" && dnsdomainname || domainname)\"\n" >> $(obj)/build.h printf "#define COREBOOT_COMPILE_HOST \"$(shell hostname)\"\n" >> $(obj)/build.ht
printf "#include \"config.h\"\n" >> $(obj)/build.h printf "#define COREBOOT_COMPILE_DOMAIN \"$(shell test `uname -s` = "Linux" && dnsdomainname || domainname)\"\n" >> $(obj)/build.ht
printf "#include \"config.h\"\n" >> $(obj)/build.ht
mv $(obj)/build.ht $(obj)/build.h
doxy: doxygen doxy: doxygen
doxygen: doxygen: