diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-03-12 15:07:41 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-03-12 15:07:41 -0500 |
| commit | 2c9f0b077018d2cac599bd2f466769cd5ffd3adc (patch) | |
| tree | 57471e07a36c096bc9223b2fc76cced32eafa04b /gnu/packages/gcc.scm | |
| parent | f5a9103991531d17bd1d5a944dcec1c49fb9f395 (diff) | |
| parent | 9591e11a4c87982943c9eb527b3b1d72aab8cc08 (diff) | |
| download | guix-2c9f0b077018d2cac599bd2f466769cd5ffd3adc.tar.gz | |
Merge branch 'master' into security-updates
Diffstat (limited to 'gnu/packages/gcc.scm')
| -rw-r--r-- | 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 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 <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014, 2015 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> ;;; @@ -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 |