01/01: gnu: gcj: Remove broken symlink and conflicting files.

[Ricardo Wurmus]

rekado pushed a commit to branch core-updates
in repository guix.

commit 5f6887e839c10f0c905969d07baca4e03f453e82
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Apr 30 17:11:39 2015 +0200

    gnu: gcj: Remove broken symlink and conflicting files.
    
    * gnu/packages/gcc.scm (gcj)[arguments]: Add a build phase to remove a 
broken
      symlink and generic stump binaries.
---
 gnu/packages/gcc.scm |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index c368b7d..957917b 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -444,7 +444,18 @@ Go.  It also includes runtime support libraries for these 
languages.")
                   (string-append jvm "/lib/tools.jar")))
                (chmod target #o755)
                #t))
-           ,phases))))))
+           (alist-cons-after
+            'install 'remove-broken-or-conflicting-files
+            (lambda _
+              (let ((out (assoc-ref %outputs "out")))
+                (for-each
+                 delete-file
+                 (append (find-files (string-append out "/lib/jvm/jre/lib")
+                                     "libjawt.so")
+                         (find-files (string-append out "/bin")
+                                     ".*(c\\+\\+|cpp|g\\+\\+|gcc.*)"))))
+              #t)
+            ,phases)))))))
 
 (define ecj-bootstrap-4.8
   (origin