From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cNzQBZHjIWKEZgEAgWs5BA (envelope-from ) for ; Fri, 04 Mar 2022 11:01:53 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YBxAApHjIWKKmgAAauVa8A (envelope-from ) for ; Fri, 04 Mar 2022 11:01:53 +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 A04102E7B1 for ; Fri, 4 Mar 2022 11:01:52 +0100 (CET) Received: from localhost ([::1]:39740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4kw-0006k8-Ii for larch@yhetil.org; Fri, 04 Mar 2022 05:01:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4kB-0006ip-40 for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-000646-Qr for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ4kA-0000Ty-Q9 for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v2 3/5] gnu: libcxx: 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: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.16463880081675 (code B ref 54239); Fri, 04 Mar 2022 10:01:02 +0000 Received: (at 54239) by debbugs.gnu.org; 4 Mar 2022 10:00:08 +0000 Received: from localhost ([127.0.0.1]:44581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jH-0000Qt-Va for submit@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:08 -0500 Received: from lepiller.eu ([89.234.186.109]:57144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jE-0000QJ-UV 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 b015369b 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=OKzAPpbDh5YvxgHF03P3RQFrr 7hFsdKtqRYcyY8ZoXU=; b=Ko7y6iJFXL5HuonUU1sAdWIFeT1x0V7qdoytx9hBA LbZqX0E9lpM5PIr237XaWSSHfnjmffz4tnIhE5ax3P2zPKznRps8jFyEoJdLW88E GOFcBhitSuFqHbxHjanyLOZHMETVcLl6wCZ3I9uMcCouHdA79lDb/W/wiEiLVSkI w+vbiQfkz9elXsGosEX5B4HqOEz0sNxDRSejMa7M5Tp4M6Pdx7Bnazwtn8CScejl 0B8aaLrWGMgDuM6c6cT22jV1sPrHs/wIdZoR+AFLURhcBxxfYQny2ZUae4zTLgVt UPMBAgLfUfdVHfORRFCG9gABrfP1/TKoF4v0mqMSJ2EGA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5c7d9264 (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:51 +0100 Message-Id: <4ed2af8f27dab19c56149a614b46f92fb3541ca7.1646387919.git.julien@lepiller.eu> 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=1646388112; 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=mgl2hrbpRazyb+3flqpJQyxbuT0eeap9Wjlk5Bc4lUk=; b=ekVXqnhEeT/6xW988deD68TYzWwUjdM0b21rUq6lInTBfdCod6Ki3xDqUpDlPCvYzwu7Ot /9TYZmhBcoegpGWcu56d7f54svHP7R5F5hVx8xEUi/WX+ITIx2QzI2uj4cS8HaFvyJq8Tu 92V29gu7y6Qa5tm78oCW/FVRTDQjDHhE9vaIkNZ/8MSieC+PyAZm0TvBkutnYqW2dmv8// EQDgCGO9wrtZTLRakVCxw++zaBtu2g9WtqGCaFHJFSeOiyNjtOeSP8rV81yyZjoqAx60pB AxqSPPx5yBpmUeOfbCdTIeSbXYl9OSqJpEcRFpUNgyRAvKa8EecLpJJJ35mBRw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646388112; a=rsa-sha256; cv=none; b=UiQDYwOfBNmR+Ewbw5d9phSPvwVetcX+OIKiN7ic7qKkNNMHiDHIPlPhpWewBC8vuGQHmX P6btWteALgCVLINMcLNx/yAnk0Xa905J/7QuCbgj1NZxSP+9pUFIyS/ETLmUZUT6GYne/s PJbWnVL/K5+28kXf0zl2kDy34zVbmp+H4BYneJNmshg/AN8EMptp5QXBNtYAhtRSyZOJAq N1A+W6S/DcpDhBCxkBtslusFQC9u9KhAYxw6c8u5T9DYMus9fSojkR3GNhOFS288krDBZC 0hAHI1WGc4XVS2SnwHfRCx+PAwIjJIqfOwNYF+YkaTQOFhvbnzgMDnYMcLrCTQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Ko7y6iJF; 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=Ko7y6iJF; 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: A04102E7B1 X-Spam-Score: 7.04 X-Migadu-Scanner: scn0.migadu.com X-TUID: bvwVFN2CgFBO * 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 c277e2ac35..137bc99f35 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1362,8 +1362,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" @@ -1371,12 +1372,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 "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 @@ -1397,8 +1405,7 @@ (define-public libcxx-6 (sha256 (base32 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) - (native-inputs - (list clang-6 llvm-6)))) + (inputs (list llvm-6)))) (define-public libcxxabi-6 (package -- 2.34.0