From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eCgLOyvsIGJD+QAAgWs5BA (envelope-from ) for ; Thu, 03 Mar 2022 17:26:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WH7YNyvsIGKeEwAAauVa8A (envelope-from ) for ; Thu, 03 Mar 2022 17:26:19 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AE4ABA2B4 for ; Thu, 3 Mar 2022 17:26:19 +0100 (CET) Received: from localhost ([::1]:54140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPoHS-0000Uz-KV for larch@yhetil.org; Thu, 03 Mar 2022 11:26:18 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646324779; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Z6+IwJJBIW4EuwiAehjSWmdUOkPzDZhqlM3mAMwlx3U=; b=PioTUA7otdOUr6/tukfq8MxVo2H4ZTpa8KR7DwSvrBhx/Kzr5sqEHLqlO0DI5PzTReaJy5 wPza2mJeUmvSEe26Y+Vr6iFMs3QsbildkFuNS/Sx+5eMX289pd9CxhghFPwUdA/JAI62ai agidfeXXay6/GZxIK46PT9+wA5/CKFp7UUnBTbOTj9sytCsOfk92nBkdMDlRP6iG5BxkBe 54kvmHVlnqDRwStpkU3jnsvidCTVrnQ9/m5BhkMe9j9NRVySvcX8QkDNB3XDARKYEL4eNU 2epp7AUPiHFm71Y3RBHr9xVuCjB3kcYZ8PZMydMo963MorppupThxiOOZzoQ1A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646324779; a=rsa-sha256; cv=none; b=KL6z8SjHq604TF+y/A8alsni3o++sc+jObdnHfNCpW5yYqnu0EemR40MyhlTjwu/JsIvSf bQITgSQr5otoniqCPRYhUhiodTwPcNRroBi5VxTTXIur2ijMJQG1W/nBwgH6qbZ6ESsOZL /z6MNwLed7bgfRRkJNgte+1m7e7nNaALYosMio+2xW7+HjE/aFkCV+GbUC8MZyO+CKb66X wms4S/IEUghHzBNfEin4SsbCUWXKbErglg97AyiK0l/OyyGPqhy9SIRdpzN24zHm87Nxd0 eJ7xPhwBj9N4NR7HOKSbHeBk13Hz9ciF10e4rS2HmWnCXSeCykrFZKo1Sx/PnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=UBVz99Y1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.43 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=UBVz99Y1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: AE4ABA2B4 X-Spam-Score: 6.43 X-Migadu-Scanner: scn0.migadu.com X-TUID: ksODOTY/sK+9 * 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 -- 2.34.0