[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/14: gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo.
From: |
guix-commits |
Subject: |
02/14: gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo. |
Date: |
Sun, 12 Nov 2023 02:05:54 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 15d90e7bfb5df86e0f0104614624d46b53f05858
Author: Hilton Chain <hako@ultrarare.space>
AuthorDate: Mon Oct 23 20:36:10 2023 +0800
gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo.
* gnu/packages/llvm.scm (clang-runtime-from-llvm)[arguments]<#:phases>:
Change
directory to "compiler-rt" for LLVM monorepo.
(clang-runtime-15,clang-runtime-14): Adjust accordingly.
Change-Id: I6a77c9d106439e4794b8531e2160e2c9ce63d86e
---
gnu/packages/llvm.scm | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 89b28aef9c..e1e628858b 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -161,6 +161,11 @@ as \"x86_64-linux\"."
(ice-9 match)
,@%cmake-build-system-modules)
#:phases (modify-phases (@ (guix build cmake-build-system)
%standard-phases)
+ ,@(if hash
+ '()
+ '((add-after 'unpack 'change-directory
+ (lambda _
+ (chdir "compiler-rt")))))
(add-after 'set-paths 'hide-glibc
;; Work around https://issues.guix.info/issue/36882. We
need to
;; remove glibc from CPLUS_INCLUDE_PATH so that the one
hardcoded
@@ -714,28 +719,10 @@ of programming tools as well as libraries with equivalent
functionality.")
("perl" ,perl)))))
(define-public clang-runtime-15
- (let ((template (clang-runtime-from-llvm llvm-15)))
- (package
- (inherit template)
- (arguments
- (substitute-keyword-arguments (package-arguments template)
- ((#:phases phases '(@ (guix build cmake-build-system)
%standard-phases))
- #~(modify-phases #$phases
- (add-after 'unpack 'change-directory
- (lambda _
- (chdir "compiler-rt"))))))))))
+ (clang-runtime-from-llvm llvm-15))
(define-public clang-runtime-14
- (let ((template (clang-runtime-from-llvm llvm-14)))
- (package
- (inherit template)
- (arguments
- (substitute-keyword-arguments (package-arguments template)
- ((#:phases phases '(@ (guix build cmake-build-system)
%standard-phases))
- #~(modify-phases #$phases
- (add-after 'unpack 'change-directory
- (lambda _
- (chdir "compiler-rt"))))))))))
+ (clang-runtime-from-llvm llvm-14))
(define-public clang-15
(clang-from-llvm
- 04/14: gnu: Add clang-runtime-16., (continued)
- 04/14: gnu: Add clang-runtime-16., guix-commits, 2023/11/12
- 07/14: gnu: Add clang-toolchain-16., guix-commits, 2023/11/12
- 05/14: gnu: Add clang-16., guix-commits, 2023/11/12
- 09/14: gnu: Add llvm-17., guix-commits, 2023/11/12
- 13/14: gnu: Add clang-toolchain-17., guix-commits, 2023/11/12
- 10/14: gnu: Add clang-runtime-17., guix-commits, 2023/11/12
- 12/14: gnu: Add libomp-17., guix-commits, 2023/11/12
- 11/14: gnu: Add clang-17., guix-commits, 2023/11/12
- 06/14: gnu: Add libomp-16., guix-commits, 2023/11/12
- 01/14: gnu: clang-runtime-from-llvm: Adjust inputs for version 15 or later., guix-commits, 2023/11/12
- 02/14: gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo.,
guix-commits <=
- 08/14: gnu: Add lld-16., guix-commits, 2023/11/12
- 03/14: gnu: Add llvm-16., guix-commits, 2023/11/12
- 14/14: gnu: Add lld-17., guix-commits, 2023/11/12