janneke pushed a commit to branch core-packages-team-old in repository guix.
commit e5184bba653f20de62ccaab7089b734093ad8fb6 Author: Janneke Nieuwenhuizen <[email protected]> AuthorDate: Sat Dec 14 22:40:14 2024 +0100 gnu: clang-runtime: Remove gcc-12,13,14 from native-ipnuts. * gnu/packages/llvm.scm (clang-runtime-from-llvm)[native-inputs]: Use llvm's native inputs unmodified. Change-Id: Ib01403665af7a8014e6da612bc6f31257e498d88 --- gnu/packages/llvm.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0d48432e3f..7a8d98770a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Zhu Zihao <[email protected]> ;;; Copyright © 2023 Hilton Chain <[email protected]> ;;; Copyright © 2023, 2024 Zheng Junjie <[email protected]> +;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -153,23 +154,7 @@ as \"x86_64-linux\"." (patches (map search-patch patches))) (llvm-monorepo (package-version llvm)))) (build-system cmake-build-system) - (native-inputs - (cond ((version>=? version "19") - ;; TODO: Remove this when GCC 14 is the default. - ;; libfuzzer fails to build with GCC 13 - (modify-inputs (package-native-inputs llvm) - (prepend gcc-14))) - ((version>=? version "18") - ;; TODO: Remove this when GCC 13 is the default. - ;; libfuzzer fails to build with GCC 12 - (modify-inputs (package-native-inputs llvm) - (prepend gcc-13))) - ((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))) - (else (package-native-inputs llvm)))) + (native-inputs (package-native-inputs llvm)) (inputs (append (list llvm)
