From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 66701@debbugs.gnu.org
Cc: Hilton Chain <hako@ultrarare.space>, Hilton Chain <hako@ultrarare.space>
Subject: [bug#66701] [PATCH 02/14] gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo.
Date: Mon, 23 Oct 2023 20:36:10 +0800 [thread overview]
Message-ID: <07785d53bcb056226595ed303d4669f43dba5970.1698063805.git.hako@ultrarare.space> (raw)
In-Reply-To: <cover.1698063805.git.hako@ultrarare.space>
* 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 38c4047f48..97902fcf5c 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -161,6 +161,11 @@ (define* (clang-runtime-from-llvm llvm
(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 @@ (define-public llvm-14
("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
--
2.41.0
next prev parent reply other threads:[~2023-10-23 13:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 12:28 [bug#66701] [PATCH 00/14] Add LLVM 16 and 17 Hilton Chain via Guix-patches via
2023-10-23 12:36 ` [bug#66701] [PATCH 01/14] gnu: clang-runtime-from-llvm: Adjust inputs for version 15 or later Hilton Chain via Guix-patches via
2023-10-23 12:36 ` Hilton Chain via Guix-patches via [this message]
2023-10-23 12:36 ` [bug#66701] [PATCH 03/14] gnu: Add llvm-16 Hilton Chain via Guix-patches via
2023-10-23 12:36 ` [bug#66701] [PATCH 04/14] gnu: Add clang-runtime-16 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 05/14] gnu: Add clang-16 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 06/14] gnu: Add libomp-16 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 07/14] gnu: Add clang-toolchain-16 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 08/14] gnu: Add lld-16 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 09/14] gnu: Add llvm-17 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 10/14] gnu: Add clang-runtime-17 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 11/14] gnu: Add clang-17 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 12/14] gnu: Add libomp-17 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 13/14] gnu: Add clang-toolchain-17 Hilton Chain via Guix-patches via
2023-10-23 12:43 ` [bug#66701] [PATCH 14/14] gnu: Add lld-17 Hilton Chain via Guix-patches via
2023-11-06 14:47 ` [bug#66701] Add LLVM 16 and 17 Michael Ford
2023-11-12 14:14 ` bug#66701: [PATCH 00/14] " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=07785d53bcb056226595ed303d4669f43dba5970.1698063805.git.hako@ultrarare.space \
--to=guix-patches@gnu.org \
--cc=66701@debbugs.gnu.org \
--cc=hako@ultrarare.space \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.