diff options
author | Nico Huber <nico.h@gmx.de> | 2017-03-12 15:25:17 +0100 |
---|---|---|
committer | Martin Roth <martinroth@google.com> | 2017-03-23 18:55:18 +0100 |
commit | 6b28fff0be47d3394b83d2981b151d3ea55696f9 (patch) | |
tree | 928ccea4bde82ba426c2f91783ccce55356b6c2e | |
parent | 9709af3521969e8c0583952bc24077f5f0dd9617 (diff) |
crossgcc/Dockerfile: Add gnat to build the Ada toolchain
If gnat is installed, buildgcc automatically enables Ada support.
Instead of the general `gnat` package we install `gnat-6` which saves
us about 80 MiB of downloads of unused "dependencies".
Change-Id: Ie0b8564d016d458cd33ff75a2ee7bbd5de33afe2
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/18772
Tested-by: build bot (Jenkins)
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r-- | util/crossgcc/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/crossgcc/Dockerfile b/util/crossgcc/Dockerfile index da3c840501..9f1a58c760 100644 --- a/util/crossgcc/Dockerfile +++ b/util/crossgcc/Dockerfile @@ -5,8 +5,8 @@ RUN \ useradd -p locked -m coreboot && \ apt-get -qq update && \ apt-get -qq upgrade && \ - apt-get -qqy install gcc g++ make patch python diffutils bison flex \ - git doxygen ccache subversion p7zip-full unrar-free \ + apt-get -qqy install gcc g++ gnat-6 make patch python diffutils bison \ + flex git doxygen ccache subversion p7zip-full unrar-free \ m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \ dh-autoreconf unifont \ libssl-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \ @@ -22,7 +22,8 @@ COPY tarballs/ /root/coreboot/util/crossgcc/tarballs/ RUN \ cd /root/coreboot/util/crossgcc && \ - make all_without_gdb CPUS=$(nproc) DEST=/opt/xgcc && \ + make all_without_gdb \ + BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc && \ cd /root && \ rm -rf coreboot |