From: Julien Lepiller <julien@lepiller.eu>
To: 54239@debbugs.gnu.org
Subject: [bug#54239] [PATCH 4/5] gnu: libcxxabi-6: Allow cross-compilation.
Date: Thu, 3 Mar 2022 17:07:46 +0100 [thread overview]
Message-ID: <593b2077bd42bc8b045c638567ff451d114b0195.1646322873.git.julien@lepiller.eu> (raw)
In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu>
* gnu/packages/llvm.scm (libcxxabi-6)[native-inputs]: Use cross-clang for
cross-compilation. Move llvm and libcxx to...
[inputs]: ...here.
[arguments]<adjust-CPLUS_INCLUDE_PATH>: Also adjust
CROSS_CPLUS_INCLUDE_PATH when necessary.
---
gnu/packages/llvm.scm | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 9b5e495d08..63b55ef3df 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1422,19 +1422,43 @@ (define-public libcxxabi-6
(modify-phases (@ (guix build cmake-build-system) %standard-phases)
(add-after 'unpack 'chdir
(lambda _ (chdir "libcxxabi")))
- (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gcc (assoc-ref inputs "gcc")))
+ (add-after 'unpack 'adjust-CPLUS_INCLUDE_PATH
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (define (delete* what lst)
+ (if (null? what)
+ lst
+ (delete* (cdr what) (delete (car what) lst))))
+
+ (let ((gcc (or (assoc-ref inputs "gcc") (assoc-ref native-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"
(string-join
(cons (string-append
(assoc-ref inputs "libcxx") "/include/c++/v1")
- (delete (string-append gcc "/include/c++")
- (string-split (getenv "CPLUS_INCLUDE_PATH")
- #\:)))
+ (delete*
+ `(,(string-append gcc "/include/c++")
+ ,@(if cross-gcc
+ `(,(string-append cross-gcc "/include/c++"))
+ '()))
+ (string-split (getenv "CPLUS_INCLUDE_PATH")
+ #\:)))
":"))
+ (when cross-gcc
+ (setenv "CROSS_CPLUS_INCLUDE_PATH"
+ (string-join
+ (cons (string-append
+ (assoc-ref inputs "libcxx") "/include/c++/v1")
+ (delete*
+ (list (string-append cross-gcc "/include/c++")
+ (string-append gcc "/include/c++"))
+ (string-split (getenv "CROSS_CPLUS_INCLUDE_PATH")
+ #\:)))
+ ":"))
+ (format #true
+ "environment variable `CROSS_CPLUS_INCLUDE_PATH' changed to ~a~%"
+ (getenv "CROSS_CPLUS_INCLUDE_PATH")))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH")))))
@@ -1444,8 +1468,11 @@ (define-public libcxxabi-6
(assoc-ref outputs "out") "/include")))
(install-file "../libcxxabi/include/__cxxabi_config.h" include-dir)
(install-file "../libcxxabi/include/cxxabi.h" include-dir)))))))
+ (inputs (list llvm-6 libcxx-6))
(native-inputs
- (list clang-6 llvm-6 libcxx-6))
+ (list (if (%current-target-system)
+ (cross-clang (%current-target-system) #:clang clang-6)
+ clang-6)))
(home-page "https://libcxxabi.llvm.org")
(synopsis "C++ standard library support")
(description
--
2.34.0
next prev parent reply other threads:[~2022-03-03 16:16 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 ` Julien Lepiller [this message]
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 ` [bug#54239] [PATCH v3 06/10] gnu: libcxx: Allow cross-compilation Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 07/10] gnu: libcxxabi-6: " 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=593b2077bd42bc8b045c638567ff451d114b0195.1646322873.git.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.