summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2016-01-29 17:39:07 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2016-02-03 02:21:48 +0100
commit22009a3a582e52d5f78ce9e04705e1888263eeda (patch)
treef0f3aa4e7069b63ca86e6c7d3272b360fe0c15bb
parent8adbcc24309a5965c0e28aa3deca57cf23088ddb (diff)
buildgcc: Reorganize when IASL is built
Instead of passing a variable around and painstakingly making sure that one target builds with it, and the others without, make IASL a dependency of the "catch all" targets. This also drops iasl as dependency from individual architecture targets, but things are more orthogonal that way. Note: instead of `make crossgcc-i386`, use `make crossgcc-i386 iasl` Change-Id: I8cd2e89acdd0f795836571470bad28fbf8797f58 Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: https://review.coreboot.org/13563 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--util/crossgcc/Makefile18
1 files changed, 7 insertions, 11 deletions
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index fbbadac18c..11cc5fcd60 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -7,18 +7,16 @@ BUILD_PLATFORM ?= i386-elf
# Example: BUILDGCC_OPTIONS=-c to remove temporary files before build
all all_with_gdb:
- $(MAKE) build-i386
- $(MAKE) SKIP_IASL=1 \
- build-x64 build-armv7a build-mips build-riscv build-aarch64 \
- build_clang
+ $(MAKE) build-i386 build-x64 build-arm build-mips \
+ build-riscv build-aarch64 build-power8 build-nds32le \
+ build_clang build_iasl
all_without_gdb:
- $(MAKE) SKIP_GDB=1 build-i386
- $(MAKE) SKIP_IASL=1 SKIP_GDB=1 \
- build-x64 build-armv7a build-mips build-riscv build-aarch64 \
- build_clang
+ $(MAKE) SKIP_GDB=1 build-i386 build-x64 build-arm build-mips \
+ build-riscv build-aarch64 build-power8 build-nds32le \
+ build_clang build_iasl
-build_tools: build_gcc build_iasl build_gdb
+build_tools: build_gcc build_gdb
###########################################################
### targets to do buildgcc builds
@@ -33,9 +31,7 @@ ifeq ($(SKIP_GDB),)
endif
build_iasl:
-ifeq ($(SKIP_IASL),)
bash ./buildgcc -P iasl $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS)
-endif
build_clang:
ifeq ($(SKIP_CLANG),)