From patchwork Thu Jun 22 09:19:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 51164 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 C1B4A27BBE9; Thu, 22 Jun 2023 10:24:25 +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 D0A6D27BBE2 for ; Thu, 22 Jun 2023 10:24:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCGXu-0006fs-6I; Thu, 22 Jun 2023 05:24:06 -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 1qCGXq-0006ec-19 for guix-patches@gnu.org; Thu, 22 Jun 2023 05:24:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCGXp-0004dI-P4 for guix-patches@gnu.org; Thu, 22 Jun 2023 05:24:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCGXp-0001b8-LR for guix-patches@gnu.org; Thu, 22 Jun 2023 05:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64218] [PATCH 3/7] gnu: clang-15: Fix building on i686-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 09:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64218@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 64218-submit@debbugs.gnu.org id=B64218.16874257856035 (code B ref 64218); Thu, 22 Jun 2023 09:24:01 +0000 Received: (at 64218) by debbugs.gnu.org; 22 Jun 2023 09:23:05 +0000 Received: from localhost ([127.0.0.1]:34820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCGWv-0001ZG-3D for submit@debbugs.gnu.org; Thu, 22 Jun 2023 05:23:05 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:42051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCGWq-0001XS-12 for 64218@debbugs.gnu.org; Thu, 22 Jun 2023 05:23:00 -0400 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-31297125334so420638f8f.0 for <64218@debbugs.gnu.org>; Thu, 22 Jun 2023 02:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687425774; x=1690017774; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=MD1NWSr2rRE51hwb/JV6PHn09+XgdEh1pnpJZVC081Q=; b=lzwXeE56eEEoI/qlDbD1Di+FZ47JbnssvEdSztN6IUyEev/o3LqyFOXuJziz5mVrAw cmuZwVqe4FR5YXKDFBdtMXyEQEVv9D8vknLjJFvQNOA4hL4bB4SjIucsELvMvO1ptC2b OrJf5hTs1mxvBA13SBBqyCVegpuPLyLS0x6sVinS6IZg1ijSlAb1E7kcMtLF05tH5eER IQmpQvIC0On0doAEMHeDRPUXiDVYGrLFJIzFgbTzSMbOIDkxrMNTyEAaNXy6Jz+w2dHk hYX/w3JajPpa2fYdm+HG3VhtZMzU6ofy5J5DOwvLpvcN/bgs7MsF9OgqqndJ+oKQd0Kk JyTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687425774; x=1690017774; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MD1NWSr2rRE51hwb/JV6PHn09+XgdEh1pnpJZVC081Q=; b=fZbeOoYtJGNuUA/6qV8W73pNIWvXX9tyIFYTDUX62+/0Va9KCqmwAQdjCPL6gwvvCk OVx0/h0Hr/MSYeuoTKr34iPg++YNXIc4PBnQ72Dx4cNQcPx3ScOpYehvVp0xVywXqXg1 HQZgP6YRoh4AuJU5ob6r01OKkTqFneQPGhtSdivTWi2Zl9/cfuWG+bf2hlwtPfAQkuI1 4SYZ0cBv6dgqC+TURjZJqC37kqhApE+bCqU1IVgUJO3vUGEw40sMjxwkuoQMJax17614 280YAk7ynOMWSClpSRTKNKWjjZtqV8NJaoCQDX2VrzLN2lQSHPcaSjiRXtlkYt3YAyWc kUNw== X-Gm-Message-State: AC+VfDyWuN5PGben2hWoHoFYiHPVXpmpobsj0EQLUs40B2LfSLqWrnzx BQO5zuI0w71CZgQqunqNa/KhCS0JKOUWew== X-Google-Smtp-Source: ACHHUZ68t1tUNLHWb/zRtA/TvOAq16SMd2fHbinioGmN798t/89Kah8V3FDeXkFyWa5TkG2I2zrVTQ== X-Received: by 2002:a05:6000:12c8:b0:311:2888:9f95 with SMTP id l8-20020a05600012c800b0031128889f95mr15016174wrx.23.1687425773875; Thu, 22 Jun 2023 02:22:53 -0700 (PDT) Received: from localhost ([188.120.129.124]) by smtp.gmail.com with ESMTPSA id x5-20020adff645000000b0031276f8be22sm6542612wrp.97.2023.06.22.02.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 02:22:53 -0700 (PDT) From: Efraim Flashner Date: Thu, 22 Jun 2023 12:19:10 +0300 Message-Id: <22c1259428c04d43007a291a7bca36f7e1c6ccec.1687425321.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 (clang-from-llvm)[arguments]: When building at least version 15 for i686-linux skip the 'make-dynamic-linker-cache phase. --- gnu/packages/llvm.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 9764552a62..d36a95879a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -408,7 +408,11 @@ (define* (clang-from-llvm llvm clang-runtime (mkdir-p compl-dir) (rename-file "bash-autocomplete.sh" (string-append compl-dir "/clang"))))) - #t))))) + #t)) + ;; GC Warning: Out of Memory! Heap size: 3636 MiB. Returning NULL! + ,@(if (and (version>? version "15") (target-x86-32?)) + `((delete 'make-dynamic-linker-cache)) + '())))) ;; Clang supports the same environment variables as GCC. (native-search-paths