diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2019-04-12 11:12:25 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2019-04-15 16:35:09 +0000 |
| commit | e8367c0c5e4c1b003aa768d27245f4e56bb21ead (patch) | |
| tree | cb413a02147a3d802632615af2bfc8dce888c3b2 /util/genbuild_h | |
| parent | 52b0ba22e962b42211b9b9c931194a5b53f8e547 (diff) | |
| download | coreboot-e8367c0c5e4c1b003aa768d27245f4e56bb21ead.tar.xz | |
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>
Diffstat (limited to 'util/genbuild_h')
| -rwxr-xr-x | util/genbuild_h/genbuild_h.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh index bafdbc95d7..c264b74635 100755 --- a/util/genbuild_h/genbuild_h.sh +++ b/util/genbuild_h/genbuild_h.sh @@ -52,6 +52,9 @@ NetBSD|OpenBSD|DragonFly|FreeBSD|Darwin) 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 printf "/* build system definitions (autogenerated) */\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 "\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" |