From ac4f0899032341b82ea33922e336c7873039dd70 Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Fri, 13 Dec 2019 11:30:41 +0100 Subject: [PATCH] update(docker/builder): add llvm-toolset-7 Co-authored-by: Lorenzo Fontana Signed-off-by: Leonardo Di Donato --- docker/builder/Dockerfile | 4 ++-- docker/builder/root/usr/bin/scl_enable | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index 620fb46b..e67fc842 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -22,11 +22,11 @@ ARG DOCKER_VERSION=1.11.0 ARG CMAKE_VERSION=3.5.0 RUN yum -y install centos-release-scl && \ - INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build" && \ + INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel llvm-toolset-7 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build" && \ yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS -RUN source scl_source enable devtoolset-7 && \ +RUN source scl_source enable devtoolset-7 llvm-toolset-7 && \ cd /tmp && \ curl -L https://github.com/kitware/cmake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz | tar xz; \ cd cmake-${CMAKE_VERSION} && \ diff --git a/docker/builder/root/usr/bin/scl_enable b/docker/builder/root/usr/bin/scl_enable index a5eae845..d196c3d5 100755 --- a/docker/builder/root/usr/bin/scl_enable +++ b/docker/builder/root/usr/bin/scl_enable @@ -3,4 +3,4 @@ # # This will make scl collection binaries work out of box. unset BASH_ENV PROMPT_COMMAND ENV -source scl_source enable devtoolset-7 \ No newline at end of file +source scl_source enable devtoolset-7 llvm-toolset-7