From 5f27770c2f1074314e2ce9300f61145134a32442 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 12 Mar 2017 15:25:17 +0100 Subject: [PATCH] UPSTREAM: 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". BUG=none BRANCH=none TEST=none Change-Id: I41bc45fb33742a097621b714aa145d8d5caf9e10 Signed-off-by: Patrick Georgi Original-Commit-Id: 6b28fff0be47d3394b83d2981b151d3ea55696f9 Original-Change-Id: Ie0b8564d016d458cd33ff75a2ee7bbd5de33afe2 Original-Signed-off-by: Nico Huber Original-Reviewed-on: https://review.coreboot.org/18772 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Patrick Georgi Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/459662 --- util/crossgcc/Dockerfile | 7 ++++--- 1 file 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