From patchwork Sat Jul 16 19:47:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 40700 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 6B29427BBEA; Sat, 16 Jul 2022 20:49:34 +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 2737227BBE9 for ; Sat, 16 Jul 2022 20:49:34 +0100 (BST) Received: from localhost ([::1]:46560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCnnB-0004Wz-9G for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 15:49:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCnmg-0004RO-Kb for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCnmg-0004gp-Br for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCnmg-0005ID-8H for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v3 02/10] gnu: clang-runtime: Fix cross-compilation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 19:49: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.165800090220220 (code B ref 54239); Sat, 16 Jul 2022 19:49:02 +0000 Received: (at 54239) by debbugs.gnu.org; 16 Jul 2022 19:48:22 +0000 Received: from localhost ([127.0.0.1]:46146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm1-0005Fr-Jg for submit@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:22 -0400 Received: from lepiller.eu ([89.234.186.109]:44374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnlw-0005FA-Vn for 54239@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:17 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2b8120e4 for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:15 +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=YM/fqMAPDkp3gwPNQmLw4I+Q5 yWzxOXoQ+w35o3Vc6c=; b=XLOMX2bDyIVF1//J+f9CKD2QljtOCLBPNg4UU+3Cw 0KZoqEme8koDUVZBmEA5WNJOXWnlUNLuV/qNIZRb3EKdNbhKugsacojplJ1Ur1X7 SeQyM+f4DmJeQ+frw/Ve8wDDHwLgIwxPlLPBz8Vw3s4gLCl3as2cVxfatzLZUq75 7/1mJIwGvRlbBCUU8lMAuIpr/OhozW+0JXCLcoDZHpRSR0m78Bzk+CafQFByRGu/ PYDIewEyWSy0sdLiAo7k3lAsqBT6vsjFE6CGNVRiW5J87OrHheCJw0SNk7g4+TwH N8JqHydtbPKR4QAJSbu/94qjYK8hWT3A9wKPVr+NN9LcA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 937e9a23 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:14 +0000 (UTC) From: Julien Lepiller Date: Sat, 16 Jul 2022 21:47:59 +0200 Message-Id: <20220716194807.20378-2-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 (clang-runtime-from-llvm): Sanitie CROSS_CPLUS_INCLUDE_PATH in the same way as CPLUS_INCLUDE_PATH. --- gnu/packages/llvm.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 5a2f411eb2..6428391650 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -141,7 +141,7 @@ (define* (clang-runtime-from-llvm llvm ;; Work around https://issues.guix.info/issue/36882. We need to ;; remove glibc from CPLUS_INCLUDE_PATH so that the one hardcoded ;; in GCC, at the bottom of GCC include search-path is used. - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs target #:allow-other-keys) (let* ((filters '("libc")) (input-directories (filter-map (lambda (input) @@ -153,7 +153,20 @@ (define* (clang-runtime-from-llvm llvm (set-path-environment-variable "CPLUS_INCLUDE_PATH" '("include") input-directories) - #t)))))) + (when target + (let ((libc (assoc-ref inputs "cross-libc"))) + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-join + (filter + (lambda (path) + (and + (not (equal? path + (string-append libc "/include"))) + (string-suffix? "include" path))) + + (string-split (getenv "CROSS_CPLUS_INCLUDE_PATH") + #\:)) + ":")))))))))) (home-page "https://compiler-rt.llvm.org") (synopsis "Runtime library for Clang/LLVM") (description