From 5318bade32e2a3a801e838286439074aeaf1e3c7 Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 13 Jun 2021 14:01:25 -0700 Subject: [PATCH] gnu: custom-gcc: Update regex for removing executables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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 c7fcb22693..ba691010bb 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