From patchwork Tue Apr 29 15:31:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42146 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 BD3CC27BC49; Tue, 29 Apr 2025 16:33:23 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 E210B27BC4A for ; Tue, 29 Apr 2025 16:33:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9mxK-0002eU-Li; Tue, 29 Apr 2025 11:33:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9mxI-0002e7-PM for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9mxI-0006G1-Bi for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=cDdWP0OOnsgpnLzCcVMtZS5uuxbrR3GvNMSquv71eEE=; b=Oo12Wxqa9XjfXF6Y0ZcgAQJ+EV/KYvsjTwVK8faGaR6MfQ8VLaIwoWicRHt2Hy214br44W/K4O2zUCazdxQF1+cgk64Sow3jbX9xjwhFkAFS4myn++k2XU6/Fh3z9hcTURcr/RQAkK0pVOJaxRjWgB1RHy7ckC+VLZv7vM/DT8MjUv2+JdetOMky59LXgByOz7/2WoMHxQ83ud6ca6uOdr70zd66hdx7uwvPr3iZdtPcmKJzSppKnKHtML1KFosXD16ToLYAob+ajF6vJCDT7b2BkqaHdUWmQD9dEH1Xm/40v/X8n5KIqI+s0N6la08iUfbWxKXoH1ZcG/73wKrE7g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9mxH-0006Or-I3; Tue, 29 Apr 2025 11:33:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78102] [PATCH v2 2/3] gnu: libcxx: Fix cross-compilation build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 15:33:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78102@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Gabriel Wicki X-Debbugs-Original-Xcc: Maxim Cournoyer , Gabriel Wicki Received: via spool by 78102-submit@debbugs.gnu.org id=B78102.174594074124284 (code B ref 78102); Tue, 29 Apr 2025 15:33:07 +0000 Received: (at 78102) by debbugs.gnu.org; 29 Apr 2025 15:32:21 +0000 Received: from localhost ([127.0.0.1]:58139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9mwT-0006JE-5g for submit@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:21 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:61478) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9mwN-0006Hm-SM for 78102@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:13 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-736c3e7b390so6268445b3a.2 for <78102@debbugs.gnu.org>; Tue, 29 Apr 2025 08:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745940725; x=1746545525; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cDdWP0OOnsgpnLzCcVMtZS5uuxbrR3GvNMSquv71eEE=; b=T8VDfG5Z8f9TgiQ4pzD9uZk/ADb4tlym5kel+CI4wEMwSy/Kk5qRSxYRbWOJoDbS16 8hvRUUO66o3/uKFT/27m/2t4SC+0FJEjwmhoWFPRI35AM8aekGvJCe77BJ4CWpiQoqFA tg/l2PuROECbyyodjCqFEqimQDwRJ/fEstr24FEenEZ2Wheold9SiwaRaW81KHJSCc8b DiYJDXiI95xCXNm0IIaIlYHv+28+MG1ElyrKP2iuV3bBVifeIFRLvqUP06vpgIVWoz0O ltX1fLHbMnFtWcgNZIWYZ77Pv0d07H/9TQUTo+xwSPhIoGeAh9YyddNfatmv7pmVCktK CYFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745940725; x=1746545525; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cDdWP0OOnsgpnLzCcVMtZS5uuxbrR3GvNMSquv71eEE=; b=TZ+vUrAMpDmPasrMIlN4so1D7S2wLg+J81qVd1PE67VM5yHJfbB5bA/yupcAfGh6iL +n+irwd8am99flUCpZeF3oftZbtNsyJVy1vrH+bXaYyhKCXHLIm7TI/HROyJr3dZCRzP iYuYHBtI7gTsvIYFTIl43OdhBn9dqUxmSzsWwxAPZRYW3dnZEsDO9ziKagmXz3zfl9dO a10JRJppA7vB+JVYuXlEB/P06FFK8ehew7m38/Eq2CwrKABrekSf55F/st1AuFPCceqY u34Horoe7MSeega4Lix7WgUytNZNGCDTDWVqOmVDMrS0dVuQAf/rC3K3+8gAGdot27i3 H7EA== X-Gm-Message-State: AOJu0YwTD5Nge/WTK3y/bCNhYFR701QNG0k4vEGU9d60c4mAAIqxZFAn +gXUQM5N5I05mEvgxCIikpufE3xEcVYalpuqLkdrsVT+lb65jIt6zfWzpQ== X-Gm-Gg: ASbGncvXdH98KnAfq6lSU3hLZ4PXbKWTuoyJPEGTVa6ruSZNSRP1p9KsVoygfYC9xqi HxbX06CuPasn3QzWhJHqwBl00fNDAZ65MI6WHtXv7b7zFCfzTtirtLHKXDxEGQKtr1yZL40/8Ke Ez5eBpA5QKSHaO1Vn8mS1qw9/2IbjiRU3oIuQuK8KMWspEYp351q9OAb52VoNixIRWQHTNdO/TO iOCrxi8FT3f7aHYGvJ5TZHWf9XRfwbyyo05hzUdEjGBtncybomZH2b7Za9kUsAk6yb5ySquSKyy YpF4bc6sDLpgJavxA6TIMl8a9e1CTnDNERQFS1UsY7nZKYM38OPB/gyT3O3u X-Google-Smtp-Source: AGHT+IFHzVY0WGdg1ypwwf6DbMfAjTOymL+zIb2QTF+UREGVOKn/6S4phSb8y9So1EB/1lvBLnBzpQ== X-Received: by 2002:a05:6a00:3927:b0:732:2923:b70f with SMTP id d2e1a72fcca58-740271689ffmr5462349b3a.11.1745940725031; Tue, 29 Apr 2025 08:32:05 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a420sm10303533b3a.107.2025.04.29.08.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 08:32:04 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 30 Apr 2025 00:31:38 +0900 Message-ID: <47cce130906c96519b8f1505897c3986663b6276.1745940699.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> References: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (libcxx) [arguments] <#:implicit-inputs?>: Set to #f. <#:phases>: Remove adjust-CPLUS_INCLUDE_PATH. [native-inputs]: Explicitly provide standard inputs, filtering out gcc. Change-Id: I8cbc73ef90dce0a57bf2f8198c3176932bf24185 --- gnu/packages/llvm.scm | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a0f47447bee..49b6e27bff9 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021, 2022 Maxime Devos -;;; Copyright © 2020, 2021, 2022, 2024 Maxim Cournoyer +;;; Copyright © 2020-2022, 2024-2025 Maxim Cournoyer ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2021, 2022 Guillaume Le Vaillant @@ -52,6 +52,7 @@ (define-module (gnu packages llvm) #:use-module (guix memoization) #:use-module (guix search-paths) #:use-module (guix utils) + #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system python) @@ -1905,6 +1906,7 @@ (define-public libcxx (build-system cmake-build-system) (arguments (list + #:implicit-inputs? #f ;to avoid conflicting GCC headers #:tests? #f #:configure-flags #~(list "-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi;libunwind" @@ -1920,23 +1922,14 @@ (define-public libcxx #~(modify-phases %standard-phases (add-after 'unpack 'enter-subdirectory (lambda _ - (chdir "runtimes"))) - (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "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 (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") - #\:)) - ":")) - (format #t - "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH")) - #t)))))) + (chdir "runtimes")))))) (native-inputs - (list clang-19 libunwind-headers llvm python)) + (append (list clang-19 libunwind-headers llvm python) + ;; Remove GCC from the build environment, to avoid its C++ + ;; headers (include/c++), which would interfere and cause build + ;; failures. + (map second + (alist-delete "gcc" (standard-packages))))) (home-page "https://libcxx.llvm.org") (synopsis "C++ standard library") (description