summaryrefslogtreecommitdiff
path: root/util/crossgcc/Makefile.inc
diff options
context:
space:
mode:
authorMartin Roth <martinroth@chromium.org>2019-05-26 17:24:19 -0600
committerMartin Roth <martinroth@google.com>2019-07-25 19:05:22 +0000
commitd70f5fae1c096212ba8c3d8ed3328b3acf7db8c4 (patch)
tree023ddc47590b9c101cb3ce38d6d4bf4055f8456d /util/crossgcc/Makefile.inc
parent1662c0bbfe86d3b7fb2b7a7b3d61c4ca23926ae6 (diff)
downloadcoreboot-d70f5fae1c096212ba8c3d8ed3328b3acf7db8c4.tar.xz
crossgcc: Add nasm to toolchain
Tianocore payload uses nasm. Supply it in the coreboot toolchain instead of relying on system version. Signed-off-by: Martin Roth <martinroth@chromium.org> Change-Id: I086cbe6c46f7c09b2a7a83e177b32fd1bdf99266 Reviewed-on: https://review.coreboot.org/c/coreboot/+/33024 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util/crossgcc/Makefile.inc')
-rw-r--r--util/crossgcc/Makefile.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc
index 8f8257c2f2..0ef6b9c1e3 100644
--- a/util/crossgcc/Makefile.inc
+++ b/util/crossgcc/Makefile.inc
@@ -23,6 +23,7 @@ help_toolchain help::
@echo ' iasl - Build coreboot IASL compiler (built by all cross targets)'
@echo ' clang - Build coreboot clang compiler'
@echo ' gnumake - Build coreboot make'
+ @echo ' nasm - Build coreboot nasm'
@echo ' test-toolchain - Reports if toolchain components are out of date'
@echo ' crossgcc-ARCH - Build cross-compiler for specific architecture'
@echo ' crosstools-ARCH - Build cross-compiler with GDB for specific architecture'
@@ -41,7 +42,7 @@ crossgcc: clean-for-update
crossgcc-mips crossgcc-riscv crossgcc-power8 crossgcc-clean iasl \
clang crosstools-i386 crosstools-x64 crosstools-arm \
crosstools-aarch64 crosstools-mips crosstools-riscv crosstools-power8 \
- jenkins-build-toolchain gnumake
+ jenkins-build-toolchain gnumake nasm
$(foreach arch,$(TOOLCHAIN_ARCHES),crossgcc-$(arch)): clean-for-update
$(MAKE) -C util/crossgcc $(patsubst crossgcc-%,build-%,$@) build_iasl SKIP_GDB=1
@@ -58,6 +59,9 @@ clang: clean-for-update
gnumake: clean-for-update
$(MAKE) -C util/crossgcc build_make
+nasm: clean-for-update
+ $(MAKE) -C util/crossgcc build_nasm
+
$(foreach arch,$(TOOLCHAIN_ARCHES),crosstools-$(arch)): clean-for-update
$(MAKE) -C util/crossgcc $(patsubst crosstools-%,build-%,$@) build_iasl