From patchwork Wed Jul 20 15:09:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40793 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 7A49227BBEA; Wed, 20 Jul 2022 16:12:04 +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 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 2E71727BBE9 for ; Wed, 20 Jul 2022 16:12:04 +0100 (BST) Received: from localhost ([::1]:49478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oEBMp-0002DK-9M for patchwork@mira.cbaines.net; Wed, 20 Jul 2022 11:12:03 -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 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 (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