From c3c65ad1f93e3baaacfc93410c46d51e6f84a66d Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:11 +0000 Subject: [PATCH] gnu: make-clang-toolchain: Require explicit libomp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (make-clang-toolchain): Remove default libomp parameter since each clang-toolchain has a matching libomp package. (clang-toolchain-13): Explicitly refer to libomp-13. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 29fe7172a9..2d3ee79339 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -485,7 +485,7 @@ (define (clang-properties version) "znver3") '()))))) -(define* (make-clang-toolchain clang #:optional (libomp libomp-13)) +(define (make-clang-toolchain clang libomp) (package (name (string-append (package-name clang) "-toolchain")) (version (package-version clang)) @@ -767,7 +767,7 @@ (define-public libomp-13 (replace "llvm" llvm-13))))) (define-public clang-toolchain-13 - (make-clang-toolchain clang-13)) + (make-clang-toolchain clang-13 libomp-13)) (define-public llvm-12 (package