Subject: bug#49010: closed (Re: bug#49010: [PATCH core-updates] gnu: custom-gcc: Update regex for removing executables.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 05 Jul 2021 11:13:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
49010: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=49010
GNU Bug Tracking System
Contact [email-masked] with problems

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

Hi,

Sarah Morgensen <[email-masked]> 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’.

Subject: [PATCH core-updates] gnu: custom-gcc: Update regex for removing executables.
From: Sarah Morgensen <[email-masked]>
To: [email-masked]
Cc: Sarah Morgensen <[email-masked]>
Date: Sun, 13 Jun 2021 14:01:25 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

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