guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: gnu: custom-gcc: Update regex for removing executables.


From: guix-commits
Subject: 03/03: gnu: custom-gcc: Update regex for removing executables.
Date: Mon, 5 Jul 2021 08:09:45 -0400 (EDT)

civodul pushed a commit to branch core-updates
in repository guix.

commit 5318bade32e2a3a801e838286439074aeaf1e3c7
Author: Sarah Morgensen <iskarian@mgsn.dev>
AuthorDate: Sun Jun 13 14:01:25 2021 -0700

    gnu: custom-gcc: Update regex for removing executables.
    
    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.
    
    Signed-off-by: Ludovic Court├Ęs <ludo@gnu.org>
---
 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 c7fcb22..ba69101 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -722,9 +722,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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]