util/genbuild_h: Prefer iasl from .xcompile over a hard code

build.h provides iasl's version but right now assumes that it's kept in
util/crossgcc/xgcc/bin. Often true, but not always, so use the one found
in .xcompile to query the version as that's the version that is used in
coreboot builds.

Change-Id: Iaeedc22e0e14fa96b4f2a68127f405c7f0c9d5cc
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32300
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Patrick Georgi 2019-04-12 11:12:25 +02:00 committed by Martin Roth
parent 52b0ba22e9
commit e8367c0c5e
1 changed files with 4 additions and 1 deletions

View File

@ -52,6 +52,9 @@ NetBSD|OpenBSD|DragonFly|FreeBSD|Darwin)
esac esac
} }
IASL=util/crossgcc/xgcc/bin/iasl
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"
printf "#ifndef __BUILD_H\n" printf "#ifndef __BUILD_H\n"
@ -73,5 +76,5 @@ printf "#define COREBOOT_BUILD_WEEKDAY_BCD 0x$(our_date "$DATE" +%w)\n"
printf "#define COREBOOT_DMI_DATE \"$(our_date "$DATE" +%m/%d/%Y)\"\n" printf "#define COREBOOT_DMI_DATE \"$(our_date "$DATE" +%m/%d/%Y)\"\n"
printf "\n" printf "\n"
printf "#define COREBOOT_COMPILE_TIME \"$(our_date "$DATE" +%T)\"\n" printf "#define COREBOOT_COMPILE_TIME \"$(our_date "$DATE" +%T)\"\n"
printf "#define ASL_VERSION 0x%d\n" `./util/crossgcc/xgcc/bin/iasl -v | grep version | sed 's/.*version //'` printf "#define ASL_VERSION 0x%d\n" `$IASL -v | grep version | sed 's/.*version //'`
printf "#endif\n" printf "#endif\n"