diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2020-07-10 15:05:44 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-08-02 11:51:14 +0000 |
| commit | 5c992691e9879a1bb6312ca68e06291f2d5a576a (patch) | |
| tree | ce407dfe456a3a5ca2a6a5d0b43680daad630bbb /bionic-amd64-tcwg-base | |
| parent | fb8f02b349d66239c9975936d6c761a68480b320 (diff) | |
tcwg-base-*: Use make -j$(nproc) when building CMake
We used -j1 to avoid memory exhaustion on armhf builders, but since we
moved to more powerful machines we can remove this restriction.
See LSS-1149.
Change-Id: I30c1a1ac1cd94743172f41ec63c597bbe35b7717
Diffstat (limited to 'bionic-amd64-tcwg-base')
| -rw-r--r-- | bionic-amd64-tcwg-base/Dockerfile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile index 26b78e5b..d61cdb4f 100644 --- a/bionic-amd64-tcwg-base/Dockerfile +++ b/bionic-amd64-tcwg-base/Dockerfile @@ -211,13 +211,12 @@ RUN cd /tmp \ && rm -rf /tmp/openocd # Install cmake v3.16 (same as in upcoming Ubuntu Focal images) -# Don't build in parallel for the sake of armhf-01, which runs out of RAM RUN cd /tmp \ && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \ && cd /tmp/CMake \ - && ./bootstrap --parallel=1 \ - && make -j1 \ - && make -j1 install \ + && ./bootstrap --parallel=$(nproc --all) \ + && make -j$(nproc --all) \ + && make -j$(nproc --all) install \ && cd /tmp \ && rm -rf /tmp/CMake @@ -238,4 +237,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: a606815dfb539c2087d798c16bbb030c +# checksum: f81fab4940438641fd170452be7a5198 |