From dd477e9ba3f30a8ee9c7ee1625db2ec4f2c84523 Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.h@gmx.de>
Date: Sun, 4 Nov 2018 16:16:29 +0100
Subject: 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@gmx.de>
Reviewed-on: https://review.coreboot.org/29455
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
---
util/docker/coreboot-sdk/Dockerfile | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
(limited to 'util')
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile
index bdfbf4add0..739e0d1149 100644
--- a/util/docker/coreboot-sdk/Dockerfile
+++ b/util/docker/coreboot-sdk/Dockerfile
@@ -74,12 +74,19 @@ RUN \
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 && \
--
cgit v1.2.3