bump llvm version on centos7

samcmill · Aug 22, 2021 · 8fc2c60 · 8fc2c60
1 parent eb48f82
commit 8fc2c60
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/containers/Dockerfile.centos7-llvm b/containers/Dockerfile.centos7-llvm
@@ -7,10 +7,14 @@ RUN yum install -y \
         gcc \
         gcc-c++ && \
     rm -rf /var/cache/yum/*
-RUN yum install -y \
-        clang && \
+RUN yum install -y centos-release-scl && \
+    yum install -y \
+        llvm-toolset-7-clang \
+        llvm-toolset-7-libomp-devel && \
     rm -rf /var/cache/yum/*
-ENV CPATH=/usr/lib/gcc/x86_64-redhat-linux/4.8.2/include:$CPATH
+ENV CPATH=/usr/lib/gcc/x86_64-redhat-linux/4.8.2/include:$CPATH \
+    LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7/root/usr/lib64:$LD_LIBRARY_PATH \
+    PATH=/opt/rh/llvm-toolset-7/root/usr/bin:$PATH
 
 # Python
 RUN yum install -y \

diff --git a/containers/recipe.py b/containers/recipe.py
@@ -38,7 +38,10 @@
       compiler = gnu(fortran=False)
       apt.extend(['libopenmpi-dev', 'openmpi-bin'])
   elif toolset == 'llvm':
-    compiler = llvm()
+    if image == 'centos:7':
+      compiler = llvm(version='7')
+    else:
+      compiler = llvm()
   else:
     raise RuntimeError('unrecognized toolset')