From 82f145ef7aef8f4d28a144ee8efcadf3fdd4b877 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 10 Mar 2016 07:05:08 +0100 Subject: 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 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e15b07752b..73c6d488fb 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 ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2014, 2015 Ricardo Wurmus +;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Efraim Flashner ;;; @@ -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 -- cgit 1.4.1