From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iCmDL0Ub2GJG4QAAbAwnHQ (envelope-from ) for ; Wed, 20 Jul 2022 17:12:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wGhwL0Ub2GJluwAAauVa8A (envelope-from ) for ; Wed, 20 Jul 2022 17:12:05 +0200 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 9C5644468F for ; Wed, 20 Jul 2022 17:12:05 +0200 (CEST) Received: from localhost ([::1]:49478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oEBMq-0002DK-BE for larch@yhetil.org; Wed, 20 Jul 2022 11:12:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oEBLr-0000Ob-KC for guix-patches@gnu.org; Wed, 20 Jul 2022 11:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oEBLr-0002eY-CE for guix-patches@gnu.org; Wed, 20 Jul 2022 11:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oEBLr-0004PK-85 for guix-patches@gnu.org; Wed, 20 Jul 2022 11:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56666] [PATCH 17/17] gnu: make-clang-toolchain: Require explicit libomp. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Jul 2022 15:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56666 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56666@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56666-submit@debbugs.gnu.org id=B56666.165832981416829 (code B ref 56666); Wed, 20 Jul 2022 15:11:03 +0000 Received: (at 56666) by debbugs.gnu.org; 20 Jul 2022 15:10:14 +0000 Received: from localhost ([127.0.0.1]:58596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oEBL3-0004NH-NW for submit@debbugs.gnu.org; Wed, 20 Jul 2022 11:10:13 -0400 Received: from mail-qk1-f182.google.com ([209.85.222.182]:36367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oEBKc-0004IV-BW for 56666@debbugs.gnu.org; Wed, 20 Jul 2022 11:09:46 -0400 Received: by mail-qk1-f182.google.com with SMTP id l3so11676480qkl.3 for <56666@debbugs.gnu.org>; Wed, 20 Jul 2022 08:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ijxIq69FnK7n3LuKlkpskPRp/8Ll5CzgVtI2q0NLgCw=; b=ETOCtTxAATf61rLpynNYLJZAf0ciU5ORPuniQFIwuaOhOjAD0Rf+TzIG/KNMlDPJv0 L65/5bDG6D7LR1P3dTalj35rJB/KE7X72bJo8sCrCd7QV7TIYVA+TbMu51OSSTO0AYNk fqdlkOGpVSdJ9eCJm6kB/zYJrXY+22ROciNFCH8PRpaKrXLpgJ4FCxouUOqtt2khoFV4 0eWZ9707bCD6QKX3GPbS22johW90uyH2mq8F2L/ZZT26QNFyJu2h9qVIYOUw5cBWP48G Y4NprLij/5fQpvpZqPJ4hzQ6Tp7FUKx+PvSMQPrTM1eEXahZzLtzZq+dRCbpuUPwBk7t gbqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ijxIq69FnK7n3LuKlkpskPRp/8Ll5CzgVtI2q0NLgCw=; b=JQioLv8lLtMr2s9vuzRy13QJnVKnQ/1BRfERyxzwPw6GSLMtyWelj99vbo0liFTm3O q9pKzwNuvIF559K2jQf2iZN3NaYdE/mlKtV/YEEzhxTr0MD5gGR/Gk5jdcNHdnX0CRzN 9I+x/gKP0nUTuMw03QQHJ4IS+aYD2nxPhXPJgCqDFEdwzh1RXHyxauieIzvJlmJ1c9xt UvbVyAPgQCmP1J3cZQfrOrBljFwhN8XW/IMx2eGhVRYh3X2XsUJuWqKzDkxtSS6mAEUI k6bD08gMX9x2jZ+LiO3cN4/NuIybcUXkcNXtcvBqBoLFuGzruNJe5XKWQdWg/jZ7GEdg ay0A== X-Gm-Message-State: AJIora9Gt208hviOknZuiD9jWYLlpfFR85jSkktDewGoWFNzYx1IPUfu xY5j3mk64YHM/W09VVdFTwC0F0CF2BCTu5zV X-Google-Smtp-Source: AGRyM1t8iVQL5gEF/q5aXqvGmdsFDH/u6q4VbYvlFJEq0GeO50YcYhIwFCDODsee9i2Kz6wsQe9yHA== X-Received: by 2002:a37:b8c3:0:b0:6b5:db72:1bfa with SMTP id i186-20020a37b8c3000000b006b5db721bfamr13512920qkf.424.1658329780542; Wed, 20 Jul 2022 08:09:40 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id cc12-20020a05622a410c00b00316a384447fsm10158847qtb.16.2022.07.20.08.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 08:09:39 -0700 (PDT) From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:11 +0000 Message-Id: X-Mailer: git-send-email 2.37.0 In-Reply-To: References: 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658329925; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=ijxIq69FnK7n3LuKlkpskPRp/8Ll5CzgVtI2q0NLgCw=; b=l1kzoO94LifKLUFKlMp11Dde+V5S8VpWIYnvFMB5lsygmRjBQptRbQDOfpwPq85xw9lC5T mamV18er2caBzTMVlK6RSCYyTOS/8QlD6oCKzOTfVTqMIMhlgLH0Yyb0IQsjV4gwNdQ/vy 4rFaaD4U6G0zPxMbLhpkDqMIMxvA+VgAcklbtiG2CyQk4S+JqnAVN3QGU2H3y1bYvHRJOh 7XPMi2BdtCfHbbfNT+jK1eLyboKjM9nPLp4lKwKrieqD/xQVtMWzrvu1yxe1lARC/vSCro BU1I9DB0ov2RHcIGXsV4FjpTw3hKYThnHi/FUpKANO/03TwbR1KfKyqPzibrnA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658329925; a=rsa-sha256; cv=none; b=YDxOVuUgHnZyF2QutWTYnwU4UqTtLgYIPXIAEjZ7GNJwQ4Xinbv2bBTscK6KFw/wAoNlFY 2/n34GIpUvNfYsTbFy11v8BslgJNp7Z5+gf9VDiNC+BO0R5WtvXtNJuh9jKCUUA9I0bzE9 kfV3lH8pLLc01xuxG0eq7BKUb5m+vAeR7ca9q+qzi0xbbb+zvMhxG+MMMDonHkXcGIIK2W bZsdqGOE/mpthHL8a9J5N5Kj2aSX0Sy3Uit51ch6Zoz6gs8oOwUhGr4MfE0ncSakdRPbQn N/+6CkdGymClvld1s5SWmn9+/FV3Ha7xqFVUnzOVLefWOHNt5HuSDyf6IOEKng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20210112.gappssmtp.com header.s=20210112 header.b=ETOCtTxA; dmarc=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: 2.47 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20210112.gappssmtp.com header.s=20210112 header.b=ETOCtTxA; dmarc=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: 9C5644468F X-Spam-Score: 2.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: PZgG3L5qKZb/ * gnu/packages/llvm.scm (make-clang-toolchain): Remove default libomp parameter since each clang-toolchain has a matching libomp package. (clang-toolchain-13): Explicitly refer to libomp-13. --- gnu/packages/llvm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 76d2ff4f84..4606cccc2a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -485,7 +485,7 @@ (define (clang-properties version) "znver3") '()))))) -(define* (make-clang-toolchain clang #:optional (libomp libomp-13)) +(define (make-clang-toolchain clang libomp) (package (name (string-append (package-name clang) "-toolchain")) (version (package-version clang)) @@ -767,7 +767,7 @@ (define-public libomp-13 (replace "llvm" llvm-13))))) (define-public clang-toolchain-13 - (make-clang-toolchain clang-13)) + (make-clang-toolchain clang-13 libomp-13)) (define-public llvm-12 (package -- 2.37.0