02/02: Revert "build-system/gnu: Keep the sloppy conversion strategy during bootstrap."

[Ludovic Courtès]

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

commit bbe7a2ce0c7cbc44349c4f073af102872e1bb965
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 1 17:05:41 2015 +0100

    Revert "build-system/gnu: Keep the sloppy conversion strategy during 
bootstrap."
    
    This reverts commit b479c3ddaf85c831e34888229849bc1ce34419de.
    This commit was the result of an incorrect characterization of the
    problem; see the log of commit 87c8b92 for details.
---
 guix/build/gnu-build-system.scm |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 5ac6b4d..5ae5371 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -22,7 +22,6 @@
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 format)
-  #:use-module (ice-9 iconv)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:export (%standard-phases
@@ -500,11 +499,8 @@ in order.  Return #t if all the PHASES succeeded, #f 
otherwise."
   (setvbuf (current-output-port) _IOLBF)
   (setvbuf (current-error-port) _IOLBF)
 
-  ;; Encoding/decoding errors shouldn't be silent.  But our bootstrap Guile
-  ;; currently doesn't have access to iconv modules, so we have to allow it to
-  ;; be sloppier (XXX).
-  (when (false-if-exception (string->bytevector "works?" "ISO-8859-1"))
-    (fluid-set! %default-port-conversion-strategy 'error))
+  ;; Encoding/decoding errors shouldn't be silent.
+  (fluid-set! %default-port-conversion-strategy 'error)
 
   ;; The trick is to #:allow-other-keys everywhere, so that each procedure in
   ;; PHASES can pick the keyword arguments it's interested in.