Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12300
-gerrit
commit 4632300c3cdcc96e4778718e02dbd1bd76214939 Author: Martin Roth martinroth@google.com Date: Tue Oct 27 15:03:46 2015 -0600
crossgcc: Update makefile builds
- Only build IASL once for the 'all' targets instead of once for each. - Change the control of what gets built from different targets to variables on the build line. - Clean up and correct the list of phony targets - Don't keep the temporary files around while building all. This takes up a lot of space. If it's desired behavior, add BUILDGCC_OPTIONS=-t on the make command line. - Add comments about CPU= and BUILDGCC_OPTIONS= variables
Change-Id: I7752974e249f25717b42be25a841c69af84d5c69 Signed-off-by: Martin Roth martinroth@google.com --- Makefile.inc | 23 ++++++++++++-------- util/crossgcc/Makefile | 57 ++++++++++++++++++++------------------------------ 2 files changed, 37 insertions(+), 43 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc index feadd0d..bb7a966 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -442,28 +442,33 @@ gitconfig: git config remote.origin.push HEAD:refs/for/master (git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
-crossgcc: crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv +# For the toolchain builds, use CPUS=x to use multiple processors to build +# use BUILDGCC_OPTIONS= to set any crossgcc command line options +# Example: BUILDGCC_OPTIONS='-t' will keep temporary files after build +crossgcc: + $(MAKE) -C util/crossgcc all_without_gdb SKIP_CLANG=1
.PHONY: crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv crossgcc-i386: clean-for-update - $(MAKE) -C util/crossgcc build-i386-without-gdb + $(MAKE) -C util/crossgcc build-i386 SKIP_GDB=1
crossgcc-x64: clean-for-update - $(MAKE) -C util/crossgcc build-x64-without-gdb + $(MAKE) -C util/crossgcc build-x64 SKIP_GDB=1
crossgcc-arm: clean-for-update - $(MAKE) -C util/crossgcc build-armv7a-without-gdb + $(MAKE) -C util/crossgcc build-armv7a SKIP_GDB=1
crossgcc-aarch64: clean-for-update - $(MAKE) -C util/crossgcc build-aarch64-without-gdb + $(MAKE) -C util/crossgcc build-aarch64 SKIP_GDB=1
crossgcc-mips: clean-for-update - $(MAKE) -C util/crossgcc build-mips-without-gdb + $(MAKE) -C util/crossgcc build-mips SKIP_GDB=1
crossgcc-riscv: clean-for-update - $(MAKE) -C util/crossgcc build-riscv-without-gdb + $(MAKE) -C util/crossgcc build-riscv SKIP_GDB=1
-crosstools: crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv +crosstools: + $(MAKE) -C util/crossgcc all_with_gdb SKIP_CLANG=1
.PHONY: crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv crosstools-i386: clean-for-update @@ -713,4 +718,4 @@ what-jenkins-does: util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) (cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml) - $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) UTIL="$(tool)" MFLAGS= MAKEFLAGS= junit.xml; ) + $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) UTIL="$(tool)" junit.xml; ) diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile index 1f1dc1f..3499aa6 100644 --- a/util/crossgcc/Makefile +++ b/util/crossgcc/Makefile @@ -1,20 +1,24 @@ # if no architecture is specified, set a default BUILD_PLATFORM ?= i386-elf
-all: - $(MAKE) BUILDGCC_OPTIONS=-t build-i386 build-x64 build-armv7a build-mips build-riscv build-aarch64 \ - build_clang - $(MAKE) clean_tempfiles +# For the toolchain builds, use CPUS=x to use multiple processors to build +# use BUILDGCC_OPTIONS= to set any crossgcc command line options +# Example: BUILDGCC_OPTIONS='-t' will keep temporary files after build + +all all_with_gdb: + $(MAKE) build-i386 + $(MAKE) SKIP_IASL=1 \ + build-x64 build-armv7a build-mips build-riscv build-aarch64 \ + build_clang
all_without_gdb: - $(MAKE) BUILDGCC_OPTIONS=-t build-i386-without-gdb build-x64-without-gdb build-armv7a-without-gdb \ - build-mips-without-gdb build-riscv-without-gdb build-aarch64-without-gdb build_clang - $(MAKE) clean_tempfiles + $(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
build_tools: build_gcc build_iasl build_gdb
-build_tools_without_gdb: build_gcc build_iasl - ########################################################### ### targets to do buildgcc builds
@@ -23,16 +27,21 @@ build_gcc: $(if $(BUILD_LANGUAGES),-l $(BUILD_LANGUAGES))
build_gdb: +ifeq ($(SKIP_GDB),) bash ./buildgcc -p $(BUILD_PLATFORM) -P gdb $(if $(CPUS),-j $(CPUS)) $(BUILDGCC_OPTIONS) +endif
build_iasl: +ifeq ($(SKIP_IASL),) bash ./buildgcc -P iasl $(if $(CPUS),-j $(CPUS)) $(BUILDGCC_OPTIONS) +endif
build_clang: +ifeq ($(SKIP_CLANG),) bash ./buildgcc -P clang $(if $(CPUS),-j $(CPUS)) $(BUILDGCC_OPTIONS) +endif
########################################################### -### Build with GDB ### build-i386: @$(MAKE) build_tools BUILD_PLATFORM=i386-elf
@@ -51,26 +60,6 @@ build-mips: build-riscv: @$(MAKE) build_tools BUILD_PLATFORM=riscv-elf
-########################################################### -### Build without GDB -build-i386-without-gdb: - @$(MAKE) build_tools_without_gdb BUILD_PLATFORM=i386-elf - -build-x64-without-gdb: - @$(MAKE) build_tools_without_gdb BUILD_PLATFORM=x86_64-elf - -build-armv7a-without-gdb: - @$(MAKE) build_tools_without_gdb BUILD_PLATFORM=armv7a-eabi - -build-aarch64-without-gdb: - @$(MAKE) build_tools_without_gdb BUILD_PLATFORM=aarch64-elf - -build-mips-without-gdb: - @$(MAKE) build_tools_without_gdb BUILD_PLATFORM=mipsel-elf - -build-riscv-without-gdb: - @$(MAKE) build_tools_without_gdb BUILD_PLATFORM=riscv-elf - clean_tempfiles: rm -rf build-* rm -rf binutils-* gcc-* gmp-* libelf-* mpc-* mpfr-* @@ -85,7 +74,7 @@ clean: clean_tempfiles distclean: clean rm -rf tarballs
-.PHONY: build_gcc build_iasl build_gdb build_tools build_tools_without_gdb \ - build-i386-without-gdb build-x64-without-gdb build-armv7a-without-gdb \ - build-aarch64-without-gdb build-mips-without-gdb build-riscv-without-gdb \ - all build clean distclean clean_tempfiles all_without_gdb +.PHONY: build_gcc build_iasl build_gdb build_clang \ + all all_with_gdb all_without_gdb build_tools \ + build-i386 build-x64 build-armv7a build-aarch64 build-mips build-riscv \ + clean distclean clean_tempfiles
-
Martin Roth