me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Sarah Morgensen 2021-06-13 14:01:25 -07:00 committed by Ludovic Courtès
parent a159586f8a
commit 5318bade32
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/gcc.scm
View File

@ -722,9 +722,10 @@ as the 'native-search-paths' field."
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'install 'remove-broken-or-conflicting-files (add-after 'install 'remove-broken-or-conflicting-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(for-each delete-file (for-each
(find-files (string-append (assoc-ref outputs "out") "/bin") delete-file
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))))) (find-files (string-append (assoc-ref outputs "out") "/bin")
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$"))))))))))
(define %generic-search-paths (define %generic-search-paths
;; This is the language-neutral search path for GCC. Entries in $CPATH are ;; This is the language-neutral search path for GCC. Entries in $CPATH are