Parallel build (retry linuxboot#984 tweaks).

.circleci/config.yml

@@ -14,7 +14,7 @@ commands:
       - run:
           name: Make Board
           command: |
-            rm -rf build/<<parameters.target>>/* build/log/* && make CPUS=16 V=1 BOARD=<<parameters.target>> || touch ./tmpDir/failed_build
+            rm -rf build/<<parameters.target>>/* build/log/* && make -j16 V=1 BOARD=<<parameters.target>> || touch ./tmpDir/failed_build
           no_output_timeout: 3h
       - run:
           name: Output build failing logs

Makefile

@@ -530,7 +530,7 @@ endif
 $(COREBOOT_UTIL_DIR)/cbmem/cbmem \
 $(COREBOOT_UTIL_DIR)/superiotool/superiotool \
 $(COREBOOT_UTIL_DIR)/inteltool/inteltool \
-: $(build)/$(coreboot_base_dir)/.canary
+: $(build)/$(coreboot_base_dir)/.canary musl-cross
 	+$(call do,MAKE,$(notdir $@),\
 		$(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
 	)

modules/musl-cross

@@ -31,13 +31,16 @@ musl-cross_libraries := \
 
 else
 
-# Force a full build of the cross compiler
-# have to build both x86_64 and i386 versions for coreboot
+# Force a full build of the cross compiler for x86_64
+# (do not build i386 since coreboot uses its own compiler)
 
 musl-cross_configure := \
-	/bin/echo -e >> Makefile 'both:' ; \
-	/bin/echo -e >> Makefile '\t$$$$(MAKE) TARGET=x86_64-linux-musl install' ; \
-	/bin/echo -e >> Makefile '\t$$$$(MAKE) TARGET=i386-linux-musl install' ; \
+	/bin/echo -e >> Makefile 'both: musl-x86_64' ; \
+	/bin/echo -e >> Makefile 'musl-x86_64: extract_all' ; \
+	/bin/echo -e >> Makefile '\t$$$$''(MAKE) TARGET=x86_64-linux-musl install' ; \
+	/bin/echo -e >> Makefile 'musl-i386: extract_all' ; \
+	/bin/echo -e >> Makefile '\t$$$$''(MAKE) TARGET=i386-linux-musl install' ; \
+	#tar xvf ../../blobs/musl-cross.config.cache.tgz ; \
 
 CROSS_PATH ?= $(pwd)/crossgcc