GNU bug report logs - #49010
[PATCH core-updates] gnu: custom-gcc: Update regex for removing executables.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49010 in the body.
You can then email your comments to 49010 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sarah Morgensen <iskarian <at> mgsn.dev>
To: guix-patches <at> gnu.org
Cc: Sarah Morgensen <iskarian <at> mgsn.dev>
Subject: [PATCH core-updates] gnu: custom-gcc: Update regex for removing
 executables.
Date: Sun, 13 Jun 2021 14:01:25 -0700

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
-- 
2.31.1

Message #10 received at 49010-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Sarah Morgensen <iskarian <at> mgsn.dev>
Cc: 49010-done <at> debbugs.gnu.org
Subject: Re: bug#49010: [PATCH core-updates] gnu: custom-gcc: Update regex
 for removing executables.
Date: Mon, 05 Jul 2021 13:12:35 +0200

Hi,

Sarah Morgensen <iskarian <at> mgsn.dev> skribis:

> 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.

Applied to ‘core-updates’.

Thanks, and sorry for the delay!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.