From patchwork Sat Jul 16 19:48:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 40705 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 1E78E27BBE9; Sat, 16 Jul 2022 20:49:59 +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 6FCE927BBEA for ; Sat, 16 Jul 2022 20:49:58 +0100 (BST) Received: from localhost ([::1]:48054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCnnZ-0005Zr-JB for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 15:49:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCnmi-0004Sg-9y for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCnmi-0004hN-1M 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 1oCnmh-0005Ij-Uo for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v3 06/10] gnu: libcxx: 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: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.165800090920271 (code B ref 54239); Sat, 16 Jul 2022 19:49:03 +0000 Received: (at 54239) by debbugs.gnu.org; 16 Jul 2022 19:48:29 +0000 Received: from localhost ([127.0.0.1]:46158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm8-0005Gl-Pe for submit@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:29 -0400 Received: from lepiller.eu ([89.234.186.109]:44374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm1-0005FA-63 for 54239@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:21 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 812f015b for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:16 +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=G3jcVycy0vGeJBNWsb6LGcvjj ERs83OKtMIoLrz9epM=; b=GoFbo085Af14KxrNWXVRvmORNtKADD80YdXabYlXy cbdt7MI/lN39QHLvBOM/nkjkbTv6qyTCCBIZioz2fxzSb6L0+uxH/zGt0AHfMVmK MW2mKsiAi0bpURmYoTLT4S5VhAy6zJHwxpDIyBFnlgzYXVAeLh+a6zAD4ssIbyrm 04VSjTIPECN+4mfhJ+bNDamYUlXcDam88sKkWkKJg9cv2kj2bapri/SSKD4MYuju VQDwrjXqqatb8uc2IDsaVu3W7UrZSkiSuiyRMGlgerfgLp3VxlYf237C1WDNvejA wl13kmjMuY7wN3k1xjQIKsH6aVFMCWimSxg5Y1YYbgRug== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7ea7132d (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:15 +0000 (UTC) From: Julien Lepiller Date: Sat, 16 Jul 2022 21:48:03 +0200 Message-Id: <20220716194807.20378-6-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 (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