* [bug#49010] [PATCH core-updates] gnu: custom-gcc: Update regex for removing executables.
@ 2021-06-13 21:01 Sarah Morgensen via Guix-patches via
2021-07-05 11:12 ` bug#49010: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Sarah Morgensen via Guix-patches via @ 2021-06-13 21:01 UTC (permalink / raw)
To: 49010; +Cc: Sarah Morgensen
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#49010: [PATCH core-updates] gnu: custom-gcc: Update regex for removing executables.
2021-06-13 21:01 [bug#49010] [PATCH core-updates] gnu: custom-gcc: Update regex for removing executables Sarah Morgensen via Guix-patches via
@ 2021-07-05 11:12 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2021-07-05 11:12 UTC (permalink / raw)
To: Sarah Morgensen; +Cc: 49010-done
Hi,
Sarah Morgensen <iskarian@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’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-05 11:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-13 21:01 [bug#49010] [PATCH core-updates] gnu: custom-gcc: Update regex for removing executables Sarah Morgensen via Guix-patches via
2021-07-05 11:12 ` bug#49010: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).