From patchwork Fri Mar 4 09:59:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37603 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2197227BBEA; Fri, 4 Mar 2022 10:01:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DBC0127BBE9 for ; Fri, 4 Mar 2022 10:01:48 +0000 (GMT) Received: from localhost ([::1]:39718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4kt-0006jM-Qt for patchwork@mira.cbaines.net; Fri, 04 Mar 2022 05:01:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-0006iZ-DL for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-00063v-3g for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ4kA-0000Tj-28 for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v2 1/5] gnu: Add cross-llvm. References: <20220303170252.3caec0a6@tachikoma.lepiller.eu> In-Reply-To: <20220303170252.3caec0a6@tachikoma.lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Mar 2022 10:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463880061649 (code B ref 54239); Fri, 04 Mar 2022 10:01:02 +0000 Received: (at 54239) by debbugs.gnu.org; 4 Mar 2022 10:00:06 +0000 Received: from localhost ([127.0.0.1]:44574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jF-0000QK-0f for submit@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:06 -0500 Received: from lepiller.eu ([89.234.186.109]:57142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jB-0000PL-I7 for 54239@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:03 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 0c521cff for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=PVbHQsUpe7ZCSCXqtXYm4YfVJ 4XJ1fuE4mRuGe9Iu+g=; b=Dv6g1l0UWQd4camKeeVi6NlhP41tDoT0AMZov2zlu fozSRTuFd4nnptLTRce0125OZg9yqCZ3J964etacbU/XUICD2uk6qQYWL+B9FUuL N7C/fChF81h9knn1Mp56zVh2IGslv6os2Znd0WSXPtNXs/YXph9JcTiSDqdGeoXW 9kZ64+41X9Bz/AU6H1CAs3Y1CD0pNd2qXrtAbqZFvJf97bq5QWID9Y9CO5UZRn7k 5Cqdr8IcDCN41M1qPJWeGx74etjcm27iqDtCzTMncyMX+nIzzBdO/b3dBB+TkUz1 Y4hlqBfduMJvYr9DMnowMeauzvfkpo3wu2LV3nEHiGtbw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b8e65455 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) From: Julien Lepiller Date: Fri, 4 Mar 2022 10:59:49 +0100 Message-Id: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (cross-llvm): New variable. --- gnu/packages/llvm.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index eb949bed1b..d6e9846699 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2020, 2021 Maxim Cournoyer -;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2021, 2022 Julien Lepiller ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxim Cournoyer @@ -74,7 +74,8 @@ (define-module (gnu packages llvm) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (make-lld-wrapper - system->llvm-target)) + system->llvm-target + cross-llvm)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -99,6 +100,22 @@ (define* (system->llvm-target #:optional ("i686" => "X86") ("i586" => "X86")))) +(define (cross-llvm llvm target) + "Return a native LLVM package that targets a different system. The resulting +libraries are running on the host but target a different system by default. +This packge can be used to control clang's default target." + (package + (inherit llvm) + (arguments + (substitute-keyword-arguments (package-arguments llvm) + ((#:configure-flags flags) + #~(append + (list + (string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" #$target) + (string-append "-DLLVM_TARGET_ARCH=" + #$(system->llvm-target (gnu-triplet->nix-system target)))) + #$flags)))))) + (define (llvm-uri component version) ;; LLVM release candidate file names are formatted 'tool-A.B.C-rcN/tool-A.B.CrcN.src.tar.xz' ;; so we specify the version as A.B.C-rcN and delete the hyphen when referencing the file name. From patchwork Fri Mar 4 09:59:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37605 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2A73D27BBE9; Fri, 4 Mar 2022 10:01:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 746CF27BBEA for ; Fri, 4 Mar 2022 10:01:49 +0000 (GMT) Received: from localhost ([::1]:39720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4ku-0006jX-Ha for patchwork@mira.cbaines.net; Fri, 04 Mar 2022 05:01:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-0006ig-Qr for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-000640-Hd for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ4kA-0000Tr-ES for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v2 2/5] gnu: Add cross-clang. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Mar 2022 10:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463880081668 (code B ref 54239); Fri, 04 Mar 2022 10:01:02 +0000 Received: (at 54239) by debbugs.gnu.org; 4 Mar 2022 10:00:08 +0000 Received: from localhost ([127.0.0.1]:44579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jH-0000Qo-BW for submit@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:07 -0500 Received: from lepiller.eu ([89.234.186.109]:57142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jE-0000PL-41 for 54239@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 64568d06 for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=yBmOCEU1YmvvTLfijKo92t8fX ULJtlb2X+yEeOKc0ZM=; b=C+Acf6O8pzcsaq9kY2ZoCJmTWCMXcwo3ot5ALUiVK mssXfYZ49IHk7m5DaC9biWaWlvfgBWf/gLqC0xEPOZIIsjj/dgkzRb8WQXWXDo3g yjvw9XLu1oFVneaeOAvCUUPHmo3odDZ/fOj8X/fymfzZu6GCCV0Z4BGa53F23lNQ O+0+VmqAXekZeRqKMe4271Xhm38Kx4bk4gjXyn8AuERQbCu34/GoYAio4vbYIBhf ja4VzecaZA0ZUFPWn3HnQgYAjJ8/a1qafmf1rMAm3LfENkRw8yI/brTp3nOpXbui qFITJjc/xYAtwQo0GlJYUbLLUq2gzZm5NJCA0ppn/CDAQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 53e2a10a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) From: Julien Lepiller Date: Fri, 4 Mar 2022 10:59:50 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (cross-clang): New variable. --- gnu/packages/llvm.scm | 144 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d6e9846699..c277e2ac35 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -54,6 +54,7 @@ (define-module (gnu packages llvm) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages cross-base) #:use-module (gnu packages gcc) #:use-module (gnu packages bootstrap) ;glibc-dynamic-linker #:use-module (gnu packages check) ;python-lit @@ -75,7 +76,9 @@ (define-module (gnu packages llvm) #:use-module (ice-9 match) #:export (make-lld-wrapper system->llvm-target - cross-llvm)) + cross-llvm + cross-clang + clang-for-target)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -1023,6 +1026,145 @@ (define-public clang-runtime clang-runtime-13) (define-public clang clang-13) (define-public clang-toolchain clang-toolchain-13) +(define* (cross-clang target + #:key + (libc (cross-libc target)) + (xgcc (cross-gcc target + #:xbinutils (cross-binutils target) + #:libc (cross-libc target))) + (clang clang)) + "Return a cross-clang compiler for target." + (define cross-clang-aux + (mlambda (target libc xgcc clang) + (package + (inherit clang) + (name (string-append "clang-cross-" target)) + (version (package-version clang)) + ;; Support the same variables as clang, even in cross-compilation context. + ;; Clang does not make a difference between native and cross-compilation. + (search-paths + (list + (search-path-specification + (variable "CROSS_LIBRARY_PATH") + (files '("lib"))) + (search-path-specification + (variable "CROSS_C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("include/c++" "include"))))) + (native-search-paths '()) + (arguments + (substitute-keyword-arguments (package-arguments clang) + ((#:configure-flags _) + `(list "-DCLANG_INCLUDE_TESTS=True" + (string-append "-DGCC_INSTALL_PREFIX=" + (assoc-ref %build-inputs "cross-gcc-lib")) + (string-append "-DC_INCLUDE_DIRS=" + (assoc-ref %build-inputs "target-libc") + "/include"))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'add-missing-libdir + (lambda _ + ;; cross-gcc installs its libraries in /lib instead of + ;; lib. + (substitute* "lib/Driver/ToolChain.cpp" + (("\"-L\"\\) \\+ LibPath\\)\\);") + ,(string-append "\"-L\") + LibPath)); + CmdArgs.push_back(Args.MakeArgString(StringRef(\"-L\") + " + "StringRef(GCC_INSTALL_PREFIX) + StringRef(\"/" + target "/lib\"))); + CmdArgs.push_back(Args.MakeArgString(StringRef(\"-rpath=\") + " + "StringRef(GCC_INSTALL_PREFIX) + StringRef(\"/" + target "/lib\")));"))))) + (add-after 'unpack 'support-cross-include-path + (lambda _ + (substitute* "lib/Driver/ToolChains/Clang.cpp" + (("C_INCLUDE_PATH") "CROSS_C_INCLUDE_PATH") + (("CPLUS_INCLUDE_PATH") "CROSS_CPLUS_INCLUDE_PATH")))) + (add-after 'unpack 'support-cross-library-path + (lambda _ + ;; LIBRARY_PATH is only supported for native builds, but we still + ;; need it (or CROSS_LIBRARY_PATH to be precise) when + ;; cross-compiling + (substitute* "lib/Driver/ToolChains/CommonArgs.cpp" + (("LIBRARY_PATH\"") + "LIBRARY_PATH\"); + } else { + addDirectoryList(Args, CmdArgs, \"-L\", \"CROSS_LIBRARY_PATH\"")))) + (replace 'set-glibc-file-names + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "target-libc")) + (compiler-rt (assoc-ref inputs "clang-runtime")) + (gcc (assoc-ref inputs "cross-gcc"))) + (setenv "LIBRARY_PATH" + (string-append + (assoc-ref inputs "libc") "/lib:" (getenv "LIBRARY_PATH"))) + ,@(cond + ((version>=? version "6.0") + `(;; Link to libclang_rt files from clang-runtime. + (substitute* "lib/Driver/ToolChain.cpp" + (("getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\""))) + + ;; Make "LibDir" refer to /lib so that it + ;; uses the right dynamic linker file name. + (substitute* "lib/Driver/ToolChains/Linux.cpp" + (("(^[[:blank:]]+LibDir = ).*" _ declaration) + (string-append declaration "\"" libc "/lib\";\n")) + + ;; Make clang look for libstdc++ in the right + ;; location. + (("LibStdCXXIncludePathCandidates\\[\\] = \\{") + (string-append + "LibStdCXXIncludePathCandidates[] = { \"" gcc + "/include/c++\",")) + + ;; Make sure libc's libdir is on the search path, to + ;; allow crt1.o & co. to be found. + (("@GLIBC_LIBDIR@") + (string-append libc "/lib"))))) + (else + `((substitute* "lib/Driver/Tools.cpp" + ;; Patch the 'getLinuxDynamicLinker' function so that + ;; it uses the right dynamic linker file name. + (("/lib64/ld-linux-x86-64.so.2") + (string-append libc ,(glibc-dynamic-linker)))) + + ;; Link to libclang_rt files from clang-runtime. + ;; This substitution needed slight adjustment in 3.8. + ,@(if (version>=? version "3.8") + '((substitute* "lib/Driver/Tools.cpp" + (("TC\\.getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\"")))) + '((substitute* "lib/Driver/ToolChain.cpp" + (("getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\""))))) + + ;; Make sure libc's libdir is on the search path, to + ;; allow crt1.o & co. to be found. + (substitute* "lib/Driver/ToolChains.cpp" + (("@GLIBC_LIBDIR@") + (string-append libc "/lib"))))))))))))) + (inputs + `(("target-libc" ,libc) + ("cross-gcc-lib" ,xgcc "lib") + ("cross-gcc" ,xgcc) + ,@(package-inputs clang))) + (propagated-inputs + (modify-inputs (package-propagated-inputs clang) + (replace "llvm" + (cross-llvm + (car (assoc-ref (package-propagated-inputs clang) "llvm")) + target))))))) + (cross-clang-aux target libc xgcc clang)) + +(define* (clang-for-target #:optional (clang clang)) + (if (%current-target-system) + (cross-clang (%current-target-system) #:clang clang) + clang)) + (define-public llvm-for-rocm (package ;; Actually based on LLVM 13 as of v4.3, but llvm-12 works just fine. From patchwork Fri Mar 4 09:59:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37604 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A501427BBE9; Fri, 4 Mar 2022 10:01:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 657D827BBE9 for ; Fri, 4 Mar 2022 10:01:49 +0000 (GMT) Received: from localhost ([::1]:39740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4ku-0006k8-Gs for patchwork@mira.cbaines.net; Fri, 04 Mar 2022 05:01:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4kB-0006ip-40 for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-000646-Qr for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ4kA-0000Ty-Q9 for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v2 3/5] gnu: libcxx: Allow cross-compilation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Mar 2022 10:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463880081675 (code B ref 54239); Fri, 04 Mar 2022 10:01:02 +0000 Received: (at 54239) by debbugs.gnu.org; 4 Mar 2022 10:00:08 +0000 Received: from localhost ([127.0.0.1]:44581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jH-0000Qt-Va for submit@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:08 -0500 Received: from lepiller.eu ([89.234.186.109]:57144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jE-0000QJ-UV for 54239@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b015369b for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=OKzAPpbDh5YvxgHF03P3RQFrr 7hFsdKtqRYcyY8ZoXU=; b=Ko7y6iJFXL5HuonUU1sAdWIFeT1x0V7qdoytx9hBA LbZqX0E9lpM5PIr237XaWSSHfnjmffz4tnIhE5ax3P2zPKznRps8jFyEoJdLW88E GOFcBhitSuFqHbxHjanyLOZHMETVcLl6wCZ3I9uMcCouHdA79lDb/W/wiEiLVSkI w+vbiQfkz9elXsGosEX5B4HqOEz0sNxDRSejMa7M5Tp4M6Pdx7Bnazwtn8CScejl 0B8aaLrWGMgDuM6c6cT22jV1sPrHs/wIdZoR+AFLURhcBxxfYQny2ZUae4zTLgVt UPMBAgLfUfdVHfORRFCG9gABrfP1/TKoF4v0mqMSJ2EGA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5c7d9264 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) From: Julien Lepiller Date: Fri, 4 Mar 2022 10:59:51 +0100 Message-Id: <4ed2af8f27dab19c56149a614b46f92fb3541ca7.1646387919.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 c277e2ac35..137bc99f35 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1362,8 +1362,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" @@ -1371,12 +1372,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 "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 @@ -1397,8 +1405,7 @@ (define-public libcxx-6 (sha256 (base32 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) - (native-inputs - (list clang-6 llvm-6)))) + (inputs (list llvm-6)))) (define-public libcxxabi-6 (package From patchwork Fri Mar 4 09:59:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37606 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E96B327BBEA; Fri, 4 Mar 2022 10:02:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B2C727BBE9 for ; Fri, 4 Mar 2022 10:02:25 +0000 (GMT) Received: from localhost ([::1]:40364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4lU-0007AC-EP for patchwork@mira.cbaines.net; Fri, 04 Mar 2022 05:02:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4kB-0006ix-GJ for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4kB-00064F-6u for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ4kB-0000U5-6B for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v2 4/5] gnu: libcxxabi-6: Allow cross-compilation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Mar 2022 10:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463880091682 (code B ref 54239); Fri, 04 Mar 2022 10:01:03 +0000 Received: (at 54239) by debbugs.gnu.org; 4 Mar 2022 10:00:09 +0000 Received: from localhost ([127.0.0.1]:44583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jI-0000Qy-Cb for submit@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:08 -0500 Received: from lepiller.eu ([89.234.186.109]:57142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jF-0000PL-Hf for 54239@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b454ee32 for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=lTsk3RKlb8edrTtw89uWpQoem cuyRAvUUnK6CRY+4Gg=; b=T8u+hLONipTZxs0iK5y80pnTj131OIPpOiZjDSq1H IM4Ozh0/lE9n3OaHUnlLUz/+0InvnzkDES5lq5awEFw1g2lj9qzMtVE8tpDX/5Bc NfrCEFYu3un4Tr8ytJBdjMcADcjvxmZwQqTMWyyk7pHC45HEUg8t7DhJ+R1H58cd SYSckzqI7LvZVkRKQI1ax6E66g4JitJaC6hOH/+pQlbizo5kVRK860x8GbXeeC6R 8I2vm4onVR+hPzub7PzZ2H+gE218vRN/zPigdgnOyODZk2vwhJTsLfRBFYlslzo3 33eiyF8GDImVG5P9kB5ojKFeg4QaH95+K+1gfUT4ztPNQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 36399f69 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) From: Julien Lepiller Date: Fri, 4 Mar 2022 10:59:52 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (libcxxabi-6)[native-inputs]: Use clang-for-target for cross-compilation. Move llvm and libcxx to... [inputs]: ...here. [arguments]: Also adjust CROSS_CPLUS_INCLUDE_PATH when necessary. --- gnu/packages/llvm.scm | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 137bc99f35..e00e92aa8c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1433,19 +1433,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"))))) @@ -1455,8 +1479,8 @@ (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))))))) - (native-inputs - (list clang-6 llvm-6 libcxx-6)) + (inputs (list llvm-6 libcxx-6)) + (native-inputs (list (clang-for-target clang-6))) (home-page "https://libcxxabi.llvm.org") (synopsis "C++ standard library support") (description From patchwork Fri Mar 4 09:59:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37607 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8733527BBEA; Fri, 4 Mar 2022 10:02:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F026627BBE9 for ; Fri, 4 Mar 2022 10:02:26 +0000 (GMT) Received: from localhost ([::1]:40402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4lW-0007Dj-3Y for patchwork@mira.cbaines.net; Fri, 04 Mar 2022 05:02:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4kB-0006j6-SG for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4kB-00064L-JC for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ4kB-0000UD-Ij for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v2 5/5] gnu: Add libcxxabi-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Mar 2022 10:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463880101691 (code B ref 54239); Fri, 04 Mar 2022 10:01:03 +0000 Received: (at 54239) by debbugs.gnu.org; 4 Mar 2022 10:00:10 +0000 Received: from localhost ([127.0.0.1]:44585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jK-0000RD-1X for submit@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:10 -0500 Received: from lepiller.eu ([89.234.186.109]:57144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jG-0000QJ-BF for 54239@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:07 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id be79e21b for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=cDaVQ5qFosiBCFerjM/fph4i8 2MVYBq2dhARAawzBSI=; b=JeBgmZSt8rmnVkQFMifaq7bRLy8fpTY237V4IkGJr PQvexNTBHZwDEz+v8kNs3auIyvifBk8OeuAZtvL1VWDqaCBr4EtJXyQDyQVTtIl9 Q6SnBh4wG6dvEkO7jdgsd1awZb6GuIUA9Q1pwT7+l02k4JsxurTdLzNwm/PqNN/S 5ZVoWFk/B8Kjf9+x6WcVHDxAqARnVELhK3FLoIBcc1TO/Smfpf0+ZYY39hiPkd2d ciaH2L4uyYgUP6uofpy3c3aSxnCFcFPHdhSBO5aLqyxuXY2jwK8fSx4nULu+CcaJ zGPp0lsx/R6mF8+RoiA/H9FhYKtevWPv4Xw3aRRtU9irQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id c8d25820 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) From: Julien Lepiller Date: Fri, 4 Mar 2022 10:59:53 +0100 Message-Id: <937fd2ca36d8368ea83be56ae29dbec1a97bfb41.1646387919.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (libcxxabi-9): New variable. (libcxxabi-6): Inherit from it. --- gnu/packages/llvm.scm | 69 ++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index e00e92aa8c..47fd8e2442 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1407,20 +1407,17 @@ (define-public libcxx-6 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) (inputs (list llvm-6)))) -(define-public libcxxabi-6 +(define-public libcxxabi-9 (package (name "libcxxabi") - (version "6.0.1") + (version (package-version clang-9)) (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/llvm/llvm-project") - (commit (string-append "llvmorg-" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (llvm-uri "libcxxabi" version)) (sha256 (base32 - "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g")))) + "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1431,8 +1428,6 @@ (define-public libcxxabi-6 "-DCMAKE_CXX_COMPILER=clang++") #:phases (modify-phases (@ (guix build cmake-build-system) %standard-phases) - (add-after 'unpack 'chdir - (lambda _ (chdir "libcxxabi"))) (add-after 'unpack 'adjust-CPLUS_INCLUDE_PATH (lambda* (#:key inputs native-inputs #:allow-other-keys) (define (delete* what lst) @@ -1466,10 +1461,10 @@ (define-public libcxxabi-6 (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 `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"))))) @@ -1477,10 +1472,15 @@ (define-public libcxxabi-6 (lambda* (#:key outputs #:allow-other-keys) (let ((include-dir (string-append (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-for-target clang-6))) + (mkdir-p include-dir) + (install-file ,(string-append "../libcxxabi-" version + ".src/include/__cxxabi_config.h") + include-dir) + (install-file ,(string-append "../libcxxabi-" version + ".src/include/cxxabi.h") + include-dir))))))) + (inputs (list llvm-9 libcxx)) + (native-inputs (list (clang-for-target clang-9))) (home-page "https://libcxxabi.llvm.org") (synopsis "C++ standard library support") (description @@ -1488,6 +1488,39 @@ (define-public libcxxabi-6 standard C++ library.") (license license:expat))) +(define-public libcxxabi-6 + (package + (inherit libcxxabi-9) + (name "libcxxabi") + (version "6.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/llvm/llvm-project") + (commit (string-append "llvmorg-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g")))) + (arguments + (substitute-keyword-arguments (package-arguments libcxxabi-9) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'chdir + (lambda _ (chdir "libcxxabi"))) + (replace 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let ((include-dir (string-append + (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 (if (%current-target-system) + (cross-clang (%current-target-system) #:clang clang-6) + clang-6))))) + (define-public libcxx+libcxxabi-6 (package (inherit libcxx-6)