summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2023-07-13 11:29:39 +0200
committerMartin Roth <martin.roth@amd.corp-partner.google.com>2023-07-17 14:18:29 +0000
commit9b186e0ffef42bd1ef673bcada7d7cf5d5220d49 (patch)
treed35206b74286ddb32fe0c32fac8ddebc9d360a69 /util
parent9ab8a78d7e37c92fb0e59b511dd3ae20f6478002 (diff)
util/xcompile: Add NASM to xcompile
Reason: opensil uses nasm code. Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Change-Id: Ib8d89354bfd21113f77927186e418e2ec3eab44c Reviewed-on: https://review.coreboot.org/c/coreboot/+/76465 Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util')
-rwxr-xr-xutil/xcompile/xcompile7
1 files changed, 7 insertions, 0 deletions
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index a3f9be73f8..bebf5ff3e8 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -58,6 +58,12 @@ elif [ "$(iasl 2>/dev/null | grep -c ACPI)" -gt 0 ]; then
IASL=iasl
fi
+if program_exists "${XGCCPATH}/nasm" ; then
+ NASM="${XGCCPATH}/nasm"
+elif program_exists nasm; then
+ NASM=nasm
+fi
+
if program_exists "${XGCCPATH}/gcc"; then
HOSTCC="${XGCCPATH}/gcc"
elif program_exists gcc; then
@@ -103,6 +109,7 @@ fi
cat <<EOF
# platform agnostic and host tools
XGCCPATH:=${XGCCPATH}
+NASM:=${NASM}
IASL:=${IASL}
HOSTCC?=${HOSTCC}
HOSTCXX?=${HOSTCXX}