[coreboot-gerrit] Change in coreboot[master]: coreboot-sdk: Build Clang first in a separate step

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/29455 )

Change subject: coreboot-sdk: Build Clang first in a separate step
......................................................................

coreboot-sdk: Build Clang first in a separate step

If we build one of the `all*` targets, build Clang first. Compiling
Clang (just for the host arch, I assume) takes more than half of the
time of the default build. When run as a separate step, we can make
use of Docker's cache if any step after Clang fails.

Change-Id: If67b458cde656f1dc6774215f6a575a48d12b797
Signed-off-by: Nico Huber <nico.h at gmx.de>
Reviewed-on: https://review.coreboot.org/29455
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Martin Roth <martinroth at google.com>
---
M util/docker/coreboot-sdk/Dockerfile
1 file changed, 12 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved



diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile
index bdfbf4a..739e0d1 100644
--- a/util/docker/coreboot-sdk/Dockerfile
+++ b/util/docker/coreboot-sdk/Dockerfile
@@ -74,12 +74,19 @@
 RUN \
 	cd /root && \
 	git clone https://review.coreboot.org/coreboot && \
-	cd coreboot/util/crossgcc && \
-	git checkout {{DOCKER_COMMIT}} && \
-	make {{CROSSGCC_PARAM}} \
+	cd coreboot && \
+	git checkout {{DOCKER_COMMIT}}
+
+RUN \
+	if echo {{CROSSGCC_PARAM}} | grep -q ^all; then \
+		make -C/root/coreboot/util/crossgcc/ build_clang \
+			BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc; \
+	fi
+
+RUN \
+	make -C/root/coreboot/util/crossgcc/ {{CROSSGCC_PARAM}} \
 		BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc && \
-	cd /root && \
-	rm -rf coreboot
+	rm -rf /root/coreboot
 
 RUN mkdir /home/coreboot/.ccache && \
 	chown coreboot:coreboot /home/coreboot/.ccache && \

-- 
To view, visit https://review.coreboot.org/29455
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If67b458cde656f1dc6774215f6a575a48d12b797
Gerrit-Change-Number: 29455
Gerrit-PatchSet: 2
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181105/33f6481c/attachment.html>