From: Julien Lepiller <julien@lepiller.eu>
To: 54239@debbugs.gnu.org
Subject: [bug#54239] [PATCH v3 06/10] gnu: libcxx: Allow cross-compilation.
Date: Sat, 16 Jul 2022 21:48:03 +0200 [thread overview]
Message-ID: <20220716194807.20378-6-julien@lepiller.eu> (raw)
In-Reply-To: <20220716194807.20378-1-julien@lepiller.eu>
* gnu/packages/llvm.scm (libcxx)[native-inputs]: Move llvm to...
[inputs]: ...here.
[arguments]: adjust CROSS_INCLUDE_PATH when cross-compiling.
(libcxx-6)[native-inputs]: Move llvm to...
[inputs]: ...here.
---
gnu/packages/llvm.scm | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 560a64840a..96620f1c3c 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1640,8 +1640,9 @@ (define-public libcxx
`(#:phases
(modify-phases (@ (guix build cmake-build-system) %standard-phases)
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gcc (assoc-ref inputs "gcc")))
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((gcc (or (assoc-ref (or native-inputs inputs) "gcc")))
+ (cross-gcc (assoc-ref native-inputs "cross-gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
@@ -1649,12 +1650,19 @@ (define-public libcxx
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
":"))
+ (when cross-gcc
+ (setenv "CROSS_CPLUS_INCLUDE_PATH"
+ (string-join (delete (string-append cross-gcc "/include/c++")
+ (string-split (getenv "CROSS_CPLUS_INCLUDE_PATH")
+ #\:))
+ ":"))
+ (format #t
+ "environment variable `CROSS_CPLUS_INCLUDE_PATH' changed to ~a~%"
+ (getenv "CROSS_CPLUS_INCLUDE_PATH")))
(format #t
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
- (getenv "CPLUS_INCLUDE_PATH"))
- #t))))))
- (native-inputs
- (list clang llvm))
+ (getenv "CPLUS_INCLUDE_PATH"))))))))
+ (inputs (list llvm-9))
(home-page "https://libcxx.llvm.org")
(synopsis "C++ standard library")
(description
@@ -1675,8 +1683,7 @@ (define-public libcxx-6
(sha256
(base32
"0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"))))
- (native-inputs
- (list clang-6 llvm-6))))
+ (inputs (list llvm-6))))
(define-public libcxxabi-6
(package
--
2.37.0
next prev parent reply other threads:[~2022-07-16 19:49 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 16:02 [bug#54239] [PATCH] gnu: Add cross-clang Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 1/5] gnu: Add cross-llvm Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 2/5] gnu: Add cross-clang Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 3/5] gnu: libcxx: Allow cross-compilation Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 4/5] gnu: libcxxabi-6: " Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 5/5] gnu: Add libcxxabi-9 Julien Lepiller
2022-03-03 16:40 ` [bug#54239] [PATCH] gnu: Add cross-clang Maxime Devos
2022-03-03 18:35 ` Julien Lepiller
2022-03-03 18:59 ` Maxime Devos
2022-03-03 21:11 ` Julien Lepiller
2022-03-04 20:05 ` Maxime Devos
2022-03-03 20:51 ` Pierre Langlois
2022-03-03 21:20 ` Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 1/5] gnu: Add cross-llvm Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 2/5] gnu: Add cross-clang Julien Lepiller
2022-03-04 19:53 ` Maxime Devos
2022-03-04 19:54 ` Maxime Devos
2022-03-05 8:30 ` Julien Lepiller
2022-03-04 19:56 ` Maxime Devos
2022-03-04 20:00 ` Maxime Devos
2022-03-05 16:05 ` Pierre Langlois
2022-03-04 9:59 ` [bug#54239] [PATCH v2 3/5] gnu: libcxx: Allow cross-compilation Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 4/5] gnu: libcxxabi-6: " Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 5/5] gnu: Add libcxxabi-9 Julien Lepiller
2022-03-04 19:50 ` Maxime Devos
2022-05-21 13:41 ` [bug#54239] [PATCH] gnu: Add cross-clang Ludovic Courtès
2022-07-16 19:44 ` Julien Lepiller
2022-07-16 19:47 ` [bug#54239] [PATCH v3 01/10] guix: Add build-system transformation for target Julien Lepiller
2022-07-16 19:47 ` [bug#54239] [PATCH v3 02/10] gnu: clang-runtime: Fix cross-compilation Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 03/10] gnu: llvm-9: " Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 04/10] gnu: Add cross-llvm Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 05/10] gnu: Add cross-clang Julien Lepiller
2022-07-16 19:48 ` Julien Lepiller [this message]
2022-07-16 19:48 ` [bug#54239] [PATCH v3 07/10] gnu: libcxxabi-6: Allow cross-compilation Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 08/10] gnu: Add libcxxabi-9 Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 09/10] gnu: Add libcxx-12 Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 10/10] gnu: Add libcxxabi-12 Julien Lepiller
2022-07-19 19:54 ` [bug#54239] [PATCH] gnu: Add cross-clang Maxime Devos
2022-07-19 20:42 ` Julien Lepiller
2022-03-04 19:34 ` [bug#54239] [PATCH v2 1/5] gnu: Add cross-llvm Pierre Langlois
2022-03-05 8:24 ` Julien Lepiller
2022-03-05 13:02 ` Pierre Langlois
2022-03-05 14:00 ` Pierre Langlois
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=20220716194807.20378-6-julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=54239@debbugs.gnu.org \
/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.