[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#66701] [PATCH 01/14] gnu: clang-runtime-from-llvm: Adjust inputs fo
From: |
Hilton Chain |
Subject: |
[bug#66701] [PATCH 01/14] gnu: clang-runtime-from-llvm: Adjust inputs for version 15 or later. |
Date: |
Mon, 23 Oct 2023 20:36:09 +0800 |
* gnu/packages/llvm.scm (clang-runtime-from-llvm)[native-inputs]: Add gcc-12
when version >= 15.
[inputs]: Add libffi when version >= 15.
(clang-runtime-15)[native-inputs,inputs]: Remove fields.
Change-Id: I4b385b937edbb7a2840b998b6dd3e31a17cb556f
---
gnu/packages/llvm.scm | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index cd551f4e02..38c4047f48 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -26,6 +26,7 @@
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -139,9 +140,19 @@ (define* (clang-runtime-from-llvm llvm
(patches (map search-patch patches)))
(llvm-monorepo (package-version llvm))))
(build-system cmake-build-system)
- (native-inputs (package-native-inputs llvm))
+ (native-inputs
+ (if (version>=? version "15")
+ ;; TODO: Remove this when GCC 12 is the default.
+ ;; libfuzzer fails to build with GCC 11
+ (modify-inputs (package-native-inputs llvm)
+ (prepend gcc-12))
+ (package-native-inputs llvm)))
(inputs
- (list llvm))
+ (append
+ (list llvm)
+ (if (version>=? version "15")
+ (list libffi)
+ '())))
(arguments
`(;; Don't use '-g' during the build to save space.
#:build-type "Release"
@@ -712,13 +723,7 @@ (define-public clang-runtime-15
#~(modify-phases #$phases
(add-after 'unpack 'change-directory
(lambda _
- (chdir "compiler-rt")))))))
- (native-inputs
- (modify-inputs (package-native-inputs template)
- (prepend gcc-12))) ;libfuzzer fails to build with GCC 11
- (inputs
- (modify-inputs (package-inputs template)
- (append libffi))))))
+ (chdir "compiler-rt"))))))))))
(define-public clang-runtime-14
(let ((template (clang-runtime-from-llvm llvm-14)))
--
2.41.0
- [bug#66701] [PATCH 00/14] Add LLVM 16 and 17., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 04/14] gnu: Add clang-runtime-16., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 02/14] gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 01/14] gnu: clang-runtime-from-llvm: Adjust inputs for version 15 or later.,
Hilton Chain <=
- [bug#66701] [PATCH 03/14] gnu: Add llvm-16., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 06/14] gnu: Add libomp-16., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 09/14] gnu: Add llvm-17., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 12/14] gnu: Add libomp-17., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 05/14] gnu: Add clang-16., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 07/14] gnu: Add clang-toolchain-16., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 10/14] gnu: Add clang-runtime-17., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 11/14] gnu: Add clang-17., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 08/14] gnu: Add lld-16., Hilton Chain, 2023/10/23
- [bug#66701] [PATCH 14/14] gnu: Add lld-17., Hilton Chain, 2023/10/23