diff options
| author | Hilton Chain <hako@ultrarare.space> | 2023-10-23 20:36:09 +0800 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-11-12 08:49:45 +0200 |
| commit | f7411e283a69621fb8240c3c22fdc4a6dcee8530 (patch) | |
| tree | 99205f4a54bb0e5aa6a209fecbd6cbfa0b92e564 /gnu | |
| parent | af6105afc67a15a491a0a4fd18a28c9f801a0b94 (diff) | |
| download | guix-f7411e283a69621fb8240c3c22fdc4a6dcee8530.tar.gz | |
gnu: clang-runtime-from-llvm: Adjust inputs for version 15 or later.
* 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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/llvm.scm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 5d779b87cc..89b28aef9c 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 @@ as \"x86_64-linux\"." (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 @@ of programming tools as well as libraries with equivalent functionality.") #~(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))) |