guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#31561] [PATCH] gnu: custom-gcc: Fix regex used for matching executa


From: Alex Vong
Subject: [bug#31561] [PATCH] gnu: custom-gcc: Fix regex used for matching executables.
Date: Wed, 23 May 2018 15:44:59 +0800
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)

Hello,

Some time ago, I tried installing gccgo and couldn't get it to
work. Later I forgot about it. Today, I want to give gccgo a try
again. So I re-encounter the same problem. After some debugging
(building gcc takes so looong!), I figure it out this time! The issue is
that the regex used for removing unneeded binaries also matches "gccgo",
the attached patch should fix the issue.

Some reflection: It took me quite a while to figure out the problem,
since 'delete-file' in (guix build utils) does not print to
stdout/stderr when it deletes a file. Should we have some kind of
tracing for procedures in (guix build utils)?

From 58a1309ff26cb4c16f36e62ddb92b106b6d4c964 Mon Sep 17 00:00:00 2001
From: Alex Vong <address@hidden>
Date: Wed, 23 May 2018 08:27:10 +0800
Subject: [PATCH] gnu: custom-gcc: Fix regex used for matching executables.

* gnu/packages/gcc.scm (custom-gcc)[arguments]: Fix regex used for matching
broken or conflicting executables to avoid deleting "gccgo".
---
 gnu/packages/gcc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index ba2fce6d3..5760e9c34 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -602,7 +602,7 @@ as the 'native-search-paths' field."
              (lambda* (#:key outputs #:allow-other-keys)
                (for-each delete-file
                          (find-files (string-append (assoc-ref outputs "out") 
"/bin")
-                                     ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc.*)"))
+                                     "(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)$"))
                #t))))))))
 
 (define %generic-search-paths
-- 
2.17.0

Cheers,
Alex

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]