Specify which GCC version to use for compiling clang in CSCS CI confi…

…gurations
pika-org · Nov 29, 2024 · 61c8afe · 61c8afe
1 parent 80bd9f3
commit 61c8afe
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/.gitlab/includes/clang13_pipeline.yml b/.gitlab/includes/clang13_pipeline.yml
@@ -11,6 +11,7 @@ include:
 .variables_clang13_config:
   variables:
     SPACK_ARCH: linux-ubuntu24.04-zen2
+    BASE_COMPILER: gcc@11
     COMPILER: clang@13.0.1
     CXXSTD: 20
     SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} cxxflags=-stdlib=libc++ malloc=system \

diff --git a/.gitlab/includes/clang14_cuda11_pipeline.yml b/.gitlab/includes/clang14_cuda11_pipeline.yml
@@ -11,6 +11,7 @@ include:
 .variables_clang14_cuda11_config:
   variables:
     SPACK_ARCH: linux-ubuntu24.04-haswell
+    BASE_COMPILER: gcc@11
     COMPILER: clang@14.0.6
     CXXSTD: 17
     GPU_TARGET: '60'

diff --git a/.gitlab/includes/clang15_pipeline.yml b/.gitlab/includes/clang15_pipeline.yml
@@ -11,6 +11,7 @@ include:
 .variables_clang15_config:
   variables:
     SPACK_ARCH: linux-ubuntu24.04-zen2
+    BASE_COMPILER: gcc@12
     COMPILER: clang@15.0.0
     CXXSTD: 20
     SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.80.0 \

diff --git a/.gitlab/includes/clang16_pipeline.yml b/.gitlab/includes/clang16_pipeline.yml
@@ -11,6 +11,7 @@ include:
 .variables_clang16_config:
   variables:
     SPACK_ARCH: linux-ubuntu24.04-zen2
+    BASE_COMPILER: gcc@12
     COMPILER: clang@16.0.2
     CXXSTD: 23
     SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.82.0 \

diff --git a/.gitlab/includes/clang17_pipeline.yml b/.gitlab/includes/clang17_pipeline.yml
@@ -11,6 +11,7 @@ include:
 .variables_clang17_config:
   variables:
     SPACK_ARCH: linux-ubuntu24.04-zen2
+    BASE_COMPILER: gcc@12
     COMPILER: clang@17.0.4
     CXXSTD: 23
     SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.83.0 \

diff --git a/.gitlab/includes/clang18_pipeline.yml b/.gitlab/includes/clang18_pipeline.yml
@@ -11,6 +11,7 @@ include:
 .variables_clang18_config:
   variables:
     SPACK_ARCH: linux-ubuntu24.04-zen2
+    BASE_COMPILER: gcc@13
     COMPILER: clang@18.1.1
     CXXSTD: 23
     SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.85.0 \

diff --git a/.gitlab/includes/clang19_pipeline.yml b/.gitlab/includes/clang19_pipeline.yml
@@ -11,6 +11,7 @@ include:
 .variables_clang19_config:
   variables:
     SPACK_ARCH: linux-ubuntu24.04-zen2
+    BASE_COMPILER: gcc@13
     COMPILER: clang@19.1.0
     CXXSTD: 23
     SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} \