From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 +AgiHq3jIWIbUwEAgWs5BA (envelope-from ) for ; Fri, 04 Mar 2022 11:02:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yI6cG63jIWJ5ZAEA9RJhRA (envelope-from ) for ; Fri, 04 Mar 2022 11:02:21 +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 2499B330DB for ; Fri, 4 Mar 2022 11:02:21 +0100 (CET) Received: from localhost ([::1]:40364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4lQ-0007AC-4a for larch@yhetil.org; Fri, 04 Mar 2022 05:02:20 -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 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=1646388141; 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=7m0qxIRdzx3Li88i2Lyy31crceSCSpXBGc2m3ye+nQ0=; b=ahWX5D6xS0cZy6JTBifG2xKyd3hsJdJ8dTvgN4tY4B29kM8JDNEHV0ohilBs4PiPFZA3KJ Nb/IhP/SoDnhUS/OAsjD2Jvk0tJTpAlhQ/p+z8PSm8xoxu7Onn+TRCT+RWY6pr0QYDwdy7 up89dwGYLan5LUsR/IrdXWgoeRe3Tf8gAGzlqLP2qs13aKDH5aVV07g9Tog3zuor955moU ekwXwcexkGFDiFz3p0Y8sGBglKG+udnpTOu2AxC+QL628j72xA+LknY77a2q8x7kZm0Spg MKfkQG4f/H+b3Uqb6jYJiPkVzT0UuwTdvSGtAfc5SuGMzJ+hfXTBnEnk4d4Wng== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646388141; a=rsa-sha256; cv=none; b=q38RJXW8UVST0yik4DvHFsWkdcubmGUoNA5Jshc07ay5/peeereWPNpi2IlpwR6uxauOh2 d/nspzPzT5XyymMazo8CmaiiibBs7s9XlKt52CqdRn34U9Tnp9E2ADhAsJoE0NsmLXPZGJ bRwCp6eUsgmCQjP7TMUQlritLIpi7Nj6ZUHHRVNZi6XxQ7jHaqXkd6ovg0O5pPrPhNCYah C6t0xl6ppHcitqr/bG1sBH+pOb5TO1OXXLvcGowe8UE/vLhAD4nwYkpdXrEte4srp0vFIG LDQUYnAFpqJZdC/7UiJ2Wx6F5ExC0ZBQec8e8Jvh3IDzDT0VfcSeejYpF5b17g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=T8u+hLON; 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: 7.04 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=T8u+hLON; 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: 2499B330DB X-Spam-Score: 7.04 X-Migadu-Scanner: scn0.migadu.com X-TUID: ylg/3dOfxOhv * 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 -- 2.34.0