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

Makefile: Pass .xcompile into genbuild_h 

I'm moving the .xcompile file into the $(obj) directory so we can leave
the source pristine. We need to pass the location of .xcompile into
genbuild_h.sh.

BUG=b:112267918
TEST=Ran genbuild_h with and without an .xcompile and verified it was
passed.

Change-Id: I8b3a75b478fad92a0b09246f0a00b0580f8c4aef
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34240
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Raul E Rangel 2019-07-09 09:52:16 -06:00 committed by Martin Roth
parent 3beb108a62
commit 4007d7f8c7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc
View File

@ -497,7 +497,7 @@ build_h_exports := BUILD_TIMELESS KERNELVERSION COREBOOT_EXTRA_VERSION
# Report new `build.ht` as dependency if `build.h` differs. # Report new `build.ht` as dependency if `build.h` differs.
build_h_check := \ build_h_check := \
export $(foreach exp,$(build_h_exports),$(exp)="$($(exp))"); \ export $(foreach exp,$(build_h_exports),$(exp)="$($(exp))"); \
util/genbuild_h/genbuild_h.sh >$(build_h)t 2>/dev/null; \ util/genbuild_h/genbuild_h.sh .xcompile >$(build_h)t 2>/dev/null; \
cmp -s $(build_h)t $(build_h) >/dev/null 2>&1 || echo $(build_h)t cmp -s $(build_h)t $(build_h) >/dev/null 2>&1 || echo $(build_h)t
$(build_h): $$(shell $$(build_h_check)) $(build_h): $$(shell $$(build_h_check))

9
util/genbuild_h/genbuild_h.sh
View File

@ -22,6 +22,13 @@ export LANG=C
export LC_ALL=C export LC_ALL=C
export TZ=UTC0 export TZ=UTC0
XCOMPILE=$1
if [ -z "$XCOMPILE" ] || [ "$1" = "--help" ]; then
echo "usage: $0 <xcompile>" >&2
exit 1
fi
# $1: format string # $1: format string
get_git_head_data() { get_git_head_data() {
LANG= git log --no-show-signature -1 --format="format:$1" 2>/dev/null || \ LANG= git log --no-show-signature -1 --format="format:$1" 2>/dev/null || \
@ -53,7 +60,7 @@ esac
} }
IASL=util/crossgcc/xgcc/bin/iasl IASL=util/crossgcc/xgcc/bin/iasl
eval $(grep ^IASL:= .xcompile 2>/dev/null | sed s,:=,=,) eval $(grep ^IASL:= "$XCOMPILE" 2>/dev/null | sed s,:=,=,)
#Print out the information that goes into build.h #Print out the information that goes into build.h
printf "/* build system definitions (autogenerated) */\n" printf "/* build system definitions (autogenerated) */\n"