summaryrefslogtreecommitdiff
path: root/util/crossgcc/Makefile
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
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')
-rw-r--r--util/crossgcc/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index a8ea815165..c4f4262e87 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -10,12 +10,12 @@ DEST ?= $(CURDIR)/xgcc
all all_with_gdb:
$(MAKE) build-i386 build-x64 build-arm build-mips \
build-riscv build-aarch64 build-ppc64 build-nds32le \
- build_clang build_iasl build_make
+ build_clang build_iasl build_make build_nasm
all_without_gdb:
$(MAKE) SKIP_GDB=1 build-i386 build-x64 build-arm build-mips \
build-riscv build-aarch64 build-ppc64 build-nds32le \
- build_clang build_iasl build_make
+ build_clang build_iasl build_make build_nasm
build_tools: build_gcc build_gdb
@@ -43,12 +43,15 @@ endif
build_make:
bash ./buildgcc -P make $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) -d $(DEST)
+build_nasm:
+ bash ./buildgcc -P nasm $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) -d $(DEST)
+
###########################################################
build-i386:
- @$(MAKE) build_tools BUILD_PLATFORM=i386-elf
+ @$(MAKE) build_tools build_nasm BUILD_PLATFORM=i386-elf
build-x64:
- @$(MAKE) build_tools BUILD_PLATFORM=x86_64-elf
+ @$(MAKE) build_tools build_nasm BUILD_PLATFORM=x86_64-elf
build-arm:
@$(MAKE) build_tools BUILD_PLATFORM=arm-eabi
@@ -86,5 +89,6 @@ distclean: clean
.PHONY: build_gcc build_iasl build_gdb build_clang all all_with_gdb \
all_without_gdb build_tools build-i386 build-x64 build-arm \
build-aarch64 build-mips build-riscv build-ppc64 build-nds32le \
+ build-nasm \
clean distclean clean_tempfiles
.NOTPARALLEL: