From patchwork Sat Jul 16 19:48:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 40704 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 5791227BBEA; Sat, 16 Jul 2022 20:49:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 C83E227BBE9 for ; Sat, 16 Jul 2022 20:49:51 +0100 (BST) Received: from localhost ([::1]:47414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCnnS-00058t-Sz for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 15:49:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCnmi-0004TV-Kn for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCnmi-0004hV-Cn for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCnmi-0005Iq-9P for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v3 07/10] gnu: libcxxabi-6: Allow cross-compilation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 19:49:04 +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.165800090920278 (code B ref 54239); Sat, 16 Jul 2022 19:49:04 +0000 Received: (at 54239) by debbugs.gnu.org; 16 Jul 2022 19:48:29 +0000 Received: from localhost ([127.0.0.1]:46160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm9-0005Gv-7A for submit@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:29 -0400 Received: from lepiller.eu ([89.234.186.109]:44376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm1-0005Fm-DA for 54239@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:22 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id bdcab96b for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:17 +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=tmTdqCzPUDQJb0VLnDMCi1uez EB9cyEs8fV2/sGhCLE=; b=BqizJ4aDuwbDLJZJPOIA2mozMeeq7cyHzAEQeTZKm zp+RGd+/UBQKd3cZausaV7pDcwGYKHyd/z/8uma7N91y35FnAL4g0wBhjM6n5YwP BgWy9bx1dikdr6/kVyg00n3vC7aW8+XLPOsl0IzBQXLnSf4Xt5vfITHAQaDCASiY XrhHNp/0wxijV39V/4HSoLeq3uq3VeeagVHPxWp4+hp3/Y6u8TVdGmStwL7vH7DY +LrGLd/gh4ivI+aOksOEH1ZPaupnvoaN9n3rc3n75B/zT1Mx+AFZLGX/EJQsckiZ DRm38G9hPDdb20CTcER4sFJ/rLiOie9GnpT5K+Glj2O0g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1093e686 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:16 +0000 (UTC) From: Julien Lepiller Date: Sat, 16 Jul 2022 21:48:04 +0200 Message-Id: <20220716194807.20378-7-julien@lepiller.eu> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220716194807.20378-1-julien@lepiller.eu> References: <20220716214424.1d521d65@sybil.lepiller.eu> <20220716194807.20378-1-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 96620f1c3c..ba48897c8b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1711,19 +1711,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"))))) @@ -1733,8 +1757,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