From patchwork Sun Jun 13 21:01:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30222 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 D83C927BC83; Sun, 13 Jun 2021 23:33:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8117E27BC81 for ; Sun, 13 Jun 2021 23:33:52 +0100 (BST) Received: from localhost ([::1]:49852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsYfv-0007zz-Kk for patchwork@mira.cbaines.net; Sun, 13 Jun 2021 18:33:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsYbH-0006bD-F1 for guix-patches@gnu.org; Sun, 13 Jun 2021 18:29:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsYbH-0006dH-8M for guix-patches@gnu.org; Sun, 13 Jun 2021 18:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsYbH-0004oC-6h for guix-patches@gnu.org; Sun, 13 Jun 2021 18:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49010] [PATCH core-updates] gnu: custom-gcc: Update regex for removing executables. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Jun 2021 22:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49010@debbugs.gnu.org Cc: Sarah Morgensen X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162362330418414 (code B ref -1); Sun, 13 Jun 2021 22:29:03 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jun 2021 22:28:24 +0000 Received: from localhost ([127.0.0.1]:44529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsYae-0004mv-AH for submit@debbugs.gnu.org; Sun, 13 Jun 2021 18:28:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:56514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsXGJ-0002ou-Ly for submit@debbugs.gnu.org; Sun, 13 Jun 2021 17:03:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsXGJ-00012p-F7 for guix-patches@gnu.org; Sun, 13 Jun 2021 17:03:19 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:25079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsXGG-00019Z-VI for guix-patches@gnu.org; Sun, 13 Jun 2021 17:03:19 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1623618192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=3dniyzsRjks+zPVZxyAgk9M5XrND92yXwE2smgbDfis=; b=OvbBJAkoVAaGUTkUTQjL5iZ2OkSWgNx/MLMMlZCv/dL0Shf9od9ITwGztR08sPVLggQSkq jgRJ2UCpkUBkqwis1pb4wlKatN1Zt0HFHGDd0NZgXSpGZoVNBZVn2FmPfP3EA9h8t/3/UQ LFXkOuW4b8fdMUkMg/7h+o4TAU9EVyo= Date: Sun, 13 Jun 2021 14:01:25 -0700 Message-Id: <20210613210125.24907-1-iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 13 Jun 2021 18:28:22 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 13 Jun 2021 18:33:46 -0400 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" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches Do not match "gccgo". Match "gcov-dump" and "gcov-tool", as well as "lto-dump" (which was introduced in GCC 10). * gnu/packages/gcc.scm (custom-gcc)[arguments]: Update regex used for matching broken or conflicting executables. --- gnu/packages/gcc.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5d114dca87..621b4a1200 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -716,9 +716,10 @@ as the 'native-search-paths' field." `(modify-phases ,phases (add-after 'install 'remove-broken-or-conflicting-files (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))))) + (for-each + delete-file + (find-files (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$")))))))))) (define %generic-search-paths ;; This is the language-neutral search path for GCC. Entries in $CPATH are