summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-08 23:11:28 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-23 22:28:49 +0100
commitcb043c2b13c484744312772e9e74e2a1dbced95b (patch)
tree8775a3b4f8ae95db5552cdb7773ed4782a442d4c
parentd3a652037ef879f9279bc056c43d15ba7afcbb25 (diff)
downloadguix-cb043c2b13c484744312772e9e74e2a1dbced95b.tar.gz
substitute-binary: Remove thread-safe 'regexp-exec' wrapper.
* guix/scripts/substitute-binary.scm: Remove 'regexp-exec' setting.
-rwxr-xr-xguix/scripts/substitute-binary.scm10
1 files changed, 0 insertions, 10 deletions
diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm
index c21c50fe9f..e797c6d40b 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -34,7 +34,6 @@
   #:use-module (ice-9 rdelim)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
-  #:use-module (ice-9 threads)
   #:use-module (ice-9 format)
   #:use-module (ice-9 ftw)
   #:use-module (ice-9 binary-ports)
@@ -96,15 +95,6 @@ disabled!~%"))
   ;; How often we want to remove files corresponding to expired cache entries.
   (* 7 24 3600))
 
-;; In Guile 2.0.9, `regexp-exec' is thread-unsafe, so work around it.
-;; See <http://bugs.gnu.org/14404>.
-(set! regexp-exec
-      (let ((real regexp-exec)
-            (lock (make-mutex)))
-        (lambda (rx str . rest)
-          (with-mutex lock
-            (apply real rx str rest)))))
-
 (define fields->alist
   ;; The narinfo format is really just like recutils.
   recutils->alist)