01/01: gnu: custom-gcc: Delete broken or conflicting executables.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 82f145ef7aef8f4d28a144ee8efcadf3fdd4b877
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Mar 10 07:05:08 2016 +0100

    gnu: custom-gcc: Delete broken or conflicting executables.
    
    * gnu/packages/gcc.scm (custom-gcc)[arguments]: Add phase to remove
    executables that are non-functional or conflict with the executables of
    "gcc".
---
 gnu/packages/gcc.scm |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index e15b077..73c6d48 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
-;;; Copyright © 2014, 2015 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2015 Andreas Enge <address@hidden>
 ;;; Copyright © 2015 Efraim Flashner <address@hidden>
 ;;;
@@ -440,7 +440,15 @@ as the 'native-search-paths' field."
         `(cons (string-append "--enable-languages="
                               ,(string-join languages ","))
                (remove (cut string-match "--enable-languages.*" <>)
-                       ,flags)))))))
+                       ,flags)))
+       ((#:phases phases)
+        `(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.*)"))
+               #t))))))))
 
 (define %generic-search-paths
   ;; This is the language-neutral search path for GCC.  Entries in $CPATH are