From patchwork Thu Mar 3 16:07:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37594 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 5573E27BBEA; Thu, 3 Mar 2022 16:17:16 +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 1E8BD27BBE9 for ; Thu, 3 Mar 2022 16:17:16 +0000 (GMT) Received: from localhost ([::1]:51292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPo8h-0004FK-7n for patchwork@mira.cbaines.net; Thu, 03 Mar 2022 11:17:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo0l-0006xu-VN for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPo0k-00086q-Ca for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPo0k-0000W2-7n for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH 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: Thu, 03 Mar 2022 16:09: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.16463236861865 (code B ref 54239); Thu, 03 Mar 2022 16:09:02 +0000 Received: (at 54239) by debbugs.gnu.org; 3 Mar 2022 16:08:06 +0000 Received: from localhost ([127.0.0.1]:43496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzp-0000Ty-Iv for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:05 -0500 Received: from lepiller.eu ([89.234.186.109]:57046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzn-0000Tf-II for 54239@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:04 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id bf5dab87 for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +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=l+VhyVOqGNtt309u0baHTG45m6fpmG4CAwsv7inMB XfmQAV3XnCeMKpKUDj71gq73YRVWOeUoSIB76Am9i/7IsOlJJcJp9J8sfnD2qZIg 5FqmJNsBGJP7p7WCSXmQ2CRxVVushpPLV8Nhq11FzwxG4EMHUIkG0t87Mkd8F+Bh 2ymz4oeD79floMBrlsM3h6b/+SYNC5S0Sgy56jIM484TSRUZbQO/DoeGZOgj4RUl k4QIpnsyWVkqzMaz4q5RSLd54wNZYg1I0y+ZarPyJFG1B35o7gsxt7G1Q1io7Mcv 3RqRoZPhBTMBWmcl8Ebi88/688+OdVevehYmSGBSYf+0A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1a29609d (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 3 Mar 2022 17:07:43 +0100 Message-Id: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.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 Thu Mar 3 16:07:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37596 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 CE11927BBEA; Thu, 3 Mar 2022 16:26:32 +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 3E35627BBE9 for ; Thu, 3 Mar 2022 16:26:32 +0000 (GMT) Received: from localhost ([::1]:54880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPoHe-0001OO-La for patchwork@mira.cbaines.net; Thu, 03 Mar 2022 11:26:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo0l-0006y2-VX for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPo0k-00086r-OZ for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPo0k-0000WA-Jx for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH 2/5] gnu: Add cross-clang. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Mar 2022 16:09: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.16463236871887 (code B ref 54239); Thu, 03 Mar 2022 16:09:02 +0000 Received: (at 54239) by debbugs.gnu.org; 3 Mar 2022 16:08:07 +0000 Received: from localhost ([127.0.0.1]:43499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzq-0000UH-U4 for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:07 -0500 Received: from lepiller.eu ([89.234.186.109]:57046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzo-0000Tf-Vb for 54239@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 3f778e49 for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +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=LL98cMsYp37N6reHNAZN2FRGc 8/iRP1UvJQxQ/xjN0M=; b=fDTAJW3oFQRCxWRK8Ky9bsOYpNbfQCQ03VZ2+5Tk9 b4UvYg+yO9pWgSZV/WA62xA3POvQ0GCu4sCJ2Ux7EbUrQmdYuL/D2+WiL16tRckJ ozUAnGqby5S779PQU7Gt6OUOA0ksxT/0IA9lGAoXfX3o4GppJwcbfnvqgJO07VW8 6A1lrWkXV46SOCtnO2dN4mFEgvmGIcO4dUQyi3VfsRWTEDPQjB5KBT3XsNEnKvnw nslPwhk5WVAyBn3mIHQk+oEaqSn8lK/c3wYeFB/up9LUSzHKCU3ixwMwjJ3Yv+/+ hiyaN3vzlhEMzwY45CZdnccaE0HYqSHgIKql5cCYGsGfw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id da5e0cd9 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 3 Mar 2022 17:07:44 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.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 | 125 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d6e9846699..c02f8e5c7a 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,8 @@ (define-module (gnu packages llvm) #:use-module (ice-9 match) #:export (make-lld-wrapper system->llvm-target - cross-llvm)) + cross-llvm + cross-clang)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -1023,6 +1025,127 @@ (define-public clang-runtime clang-runtime-13) (define-public clang clang-13) (define-public clang-toolchain clang-toolchain-13) +(define* (cross-clang target + #:optional + (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." + (package + (inherit clang) + (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 + (append + (list + (search-path-specification + (variable "CROSS_LIBRARY_PATH") + (files '("lib" "lib64")))) + (package-native-search-paths clang))) + (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-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)))))) + (define-public llvm-for-rocm (package ;; Actually based on LLVM 13 as of v4.3, but llvm-12 works just fine. From patchwork Thu Mar 3 16:07:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37595 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 BC99427BBEA; Thu, 3 Mar 2022 16:26:14 +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 8199627BBE9 for ; Thu, 3 Mar 2022 16:26:14 +0000 (GMT) Received: from localhost ([::1]:54140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPoHL-0000Uz-TW for patchwork@mira.cbaines.net; Thu, 03 Mar 2022 11:26:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo0l-0006y6-W7 for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49614) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPo0l-00086s-Ju for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPo0l-0000WH-0K for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH 3/5] gnu: libcxx: Allow cross-compilation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Mar 2022 16:09: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.16463236901903 (code B ref 54239); Thu, 03 Mar 2022 16:09:02 +0000 Received: (at 54239) by debbugs.gnu.org; 3 Mar 2022 16:08:10 +0000 Received: from localhost ([127.0.0.1]:43503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzt-0000Uc-Ep for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:09 -0500 Received: from lepiller.eu ([89.234.186.109]:57046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzq-0000Tf-4R for 54239@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 750c49a9 for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +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=M8wZ+tf7N/VNXHLYZj3eu4IiU RXw2gai8NOLe/irvfM=; b=UBVz99Y1BH/q7A6t9L4hcbrbfauF/r/uofWEPnsw1 va/SihRzM/n7cAKsxex3J2uoNG4LFsjiyJjcJ44GyT3x5rBJ8/FfcMCKq3sN4WYg wMwY0TEypgteFMU0OmMAjVrBckxfbhbcAbl5l6Mk3rpjcrKtgUGuG3F/hz+CqRk+ cg8MuE0MKIUiU6I2c3GWCOYTvTzyB1pXXTh/hsRije0Mzz9gK/hViL45R+3oezhg myqwquUSI8zByVnPmiz9nKlxSht4D5XvWD1lrFSbbPKRGfGwN4FdMlRfSEsdqEfD geY6C9DtlQpozYTAj/YbYLP78FuJGO5BJgl1Zx+spyGnA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 35546f9b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 3 Mar 2022 17:07:45 +0100 Message-Id: <2c334d7e0557d21b59eb127b9384db954f57f79c.1646322873.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.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]: Use cross-clang for cross-compilation. Move llvm to... [inputs]: ...here. [arguments]: adjust CROSS_INCLUDE_PATH when cross-compiling. (libcxx-6)[native-inputs]: Use cross-clang for cross-compilation. Move llvm to... [inputs]: ...here. --- gnu/packages/llvm.scm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c02f8e5c7a..9b5e495d08 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1026,7 +1026,7 @@ (define-public clang clang-13) (define-public clang-toolchain clang-toolchain-13) (define* (cross-clang target - #:optional + #:key (libc (cross-libc target)) (xgcc (cross-gcc target #:xbinutils (cross-binutils target) @@ -1343,8 +1343,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" @@ -1352,12 +1353,23 @@ (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)))))) + (getenv "CPLUS_INCLUDE_PATH")))))))) + (inputs (list llvm-9)) (native-inputs - (list clang llvm)) + (list (if (%current-target-system) + (cross-clang (%current-target-system) #:clang clang-9) + clang-9))) (home-page "https://libcxx.llvm.org") (synopsis "C++ standard library") (description @@ -1378,8 +1390,11 @@ (define-public libcxx-6 (sha256 (base32 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) + (inputs (list llvm-6)) (native-inputs - (list clang-6 llvm-6)))) + (list (if (%current-target-system) + (cross-clang (%current-target-system) #:clang clang-6) + clang-6))))) (define-public libcxxabi-6 (package From patchwork Thu Mar 3 16:07:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37592 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 7E8E827BBEA; Thu, 3 Mar 2022 16:16:58 +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 DD58527BBE9 for ; Thu, 3 Mar 2022 16:16:55 +0000 (GMT) Received: from localhost ([::1]:49656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPo8M-0003Ar-W6 for patchwork@mira.cbaines.net; Thu, 03 Mar 2022 11:16:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo0l-0006y7-W2 for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPo0l-00086t-Gr for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPo0l-0000WO-CE for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH 4/5] gnu: libcxxabi-6: Allow cross-compilation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Mar 2022 16:09: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.16463236901911 (code B ref 54239); Thu, 03 Mar 2022 16:09:03 +0000 Received: (at 54239) by debbugs.gnu.org; 3 Mar 2022 16:08:10 +0000 Received: from localhost ([127.0.0.1]:43505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzt-0000Ue-T4 for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:10 -0500 Received: from lepiller.eu ([89.234.186.109]:57046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzq-0000Tf-T3 for 54239@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:07 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id e5bbd3cb for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +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=orT2/iqQmmXH1q7soD3s2DNBR x7cVBARgPIaWAmZ1NQ=; b=PjwFxxcs/2cG9OXSZk9rw12iqTg/XClrgBvaKy0hi fF99TrVICYIKWfXXlhqHymeyT9yECI8BqmvZ1eqiw0QmIeH1aqjKbJxB8u+Xd2Xr QwpeTthDeKmI55snnAG9ky+Sq+SkKYICy7ReRvuU2LlcgEVNdshHEGIAiDRNElUx lwZ0P7lVedDmVGYaaF0v17KCi3m57pxtHqIdYSV3EWpAKzzEzEOZjnTzSsRtu7bg yWky4416DdNeE9nLNpGtf9VCo5lwy6WYQOOCGM6rUWhz/OwmHgtLCLob5xGC05HG ORtYoe1LBkqwRuazhfmsAcHOAMKSXnxY54jW4zQaQACtg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 90af0f78 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 3 Mar 2022 17:07:46 +0100 Message-Id: <593b2077bd42bc8b045c638567ff451d114b0195.1646322873.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.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 cross-clang for cross-compilation. Move llvm and libcxx to... [inputs]: ...here. [arguments]: 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 From patchwork Thu Mar 3 16:07:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37593 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 D627A27BBEA; Thu, 3 Mar 2022 16:17:06 +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 5572027BBE9 for ; Thu, 3 Mar 2022 16:17:06 +0000 (GMT) Received: from localhost ([::1]:50442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPo8X-0003gm-Db for patchwork@mira.cbaines.net; Thu, 03 Mar 2022 11:17:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo0m-0006yO-75 for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPo0l-00087A-UX for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPo0l-0000WW-PM for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH 5/5] gnu: Add libcxxabi-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Mar 2022 16:09: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.16463236901917 (code B ref 54239); Thu, 03 Mar 2022 16:09:03 +0000 Received: (at 54239) by debbugs.gnu.org; 3 Mar 2022 16:08:10 +0000 Received: from localhost ([127.0.0.1]:43507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzu-0000Um-7c for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:10 -0500 Received: from lepiller.eu ([89.234.186.109]:57048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzr-0000UA-11 for 54239@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:07 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2b59e5da for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +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=nx1SD4DivmfbsFfXPirGZOEIj a0iA/Dao6gRnqp6uKY=; b=jeN0AaigxijPXONyY2xWpCiGUDedL/X+5BDljN7dN +d/9g8t9vIiaDYEF7nbuxKqIlGRuSfsAlF7jXroAiTY9EqRtWOlOZrhNbJCxr2YB RGPcWvONQ+43dQSIOGH8wPXWWxw6aOwxg57wTgYM+2yJNvMRCoC1MV/5AMaifDOq D3Lz9ofS+YpU1bUU6VbDpQANF+JBKFiMjwDDHB3tnJyMPaGY+mXKyC4lvMLm5Owr qCVpoZZzMCFFoWWz/2RB8P1MimasZTyX9ApwVVSlL/6uj9uLua6ekSvywviXHakK cJaIXgxAc1c7KvpU/BkMY1k3kJFhQ9gyFVQ6pC6I6aDBA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id de4e849a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 3 Mar 2022 17:07:47 +0100 Message-Id: <4f9bdee16d84acc93f51a0f1a73149366de2b818.1646322873.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.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 | 72 +++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 63b55ef3df..f1631bbe70 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1396,20 +1396,17 @@ (define-public libcxx-6 (cross-clang (%current-target-system) #:clang clang-6) clang-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 @@ -1420,8 +1417,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) @@ -1455,10 +1450,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"))))) @@ -1466,13 +1461,19 @@ (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)) + (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 (if (%current-target-system) - (cross-clang (%current-target-system) #:clang clang-6) - clang-6))) + (cross-clang (%current-target-system) #:clang clang-9) + clang-9))) (home-page "https://libcxxabi.llvm.org") (synopsis "C++ standard library support") (description @@ -1480,6 +1481,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)