From 44542d5eb656f69c3df85f39df51a2f6aead0ad1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 13 Oct 2023 16:40:19 +0200 Subject: [PATCH] Build compiler-rt after clang compiler-rt is now build with clang, so we need to move it later in the buildorder. Resolves: RHEL-8713 --- kernel-testing.yaml | 10 +++++----- llvm-toolset.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel-testing.yaml b/kernel-testing.yaml index de1db61..796c14a 100644 --- a/kernel-testing.yaml +++ b/kernel-testing.yaml @@ -42,11 +42,6 @@ data: multilib: [x86_64] ref: stream-llvm-toolset-rhel8-rhel-8.10.0 buildorder: 0 - compiler-rt: - rationale: LLVM compiler intrinsic and sanitizer libraries - multilib: [x86_64] - ref: stream-llvm-toolset-rhel8-rhel-8.10.0 - buildorder: 1 lld: rationale: LLVM linker multilib: [x86_64] @@ -57,6 +52,11 @@ data: multilib: [x86_64] ref: stream-llvm-toolset-rhel8-rhel-8.10.0 buildorder: 1 + compiler-rt: + rationale: LLVM compiler intrinsic and sanitizer libraries + multilib: [x86_64] + ref: stream-llvm-toolset-rhel8-rhel-8.10.0 + buildorder: 2 libomp: rationale: LLVM OpenMP runtime multilib: [x86_64] diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml index c2df659..3c1be4c 100644 --- a/llvm-toolset.yaml +++ b/llvm-toolset.yaml @@ -47,11 +47,6 @@ data: multilib: [x86_64] ref: stream-llvm-toolset-rhel8-rhel-8.10.0 buildorder: 0 - compiler-rt: - rationale: LLVM compiler intrinsic and sanitizer libraries - multilib: [x86_64] - ref: stream-llvm-toolset-rhel8-rhel-8.10.0 - buildorder: 1 lld: rationale: LLVM linker multilib: [x86_64] @@ -62,6 +57,11 @@ data: multilib: [x86_64] ref: stream-llvm-toolset-rhel8-rhel-8.10.0 buildorder: 1 + compiler-rt: + rationale: LLVM compiler intrinsic and sanitizer libraries + multilib: [x86_64] + ref: stream-llvm-toolset-rhel8-rhel-8.10.0 + buildorder: 2 libomp: rationale: LLVM OpenMP runtime multilib: [x86_64]