ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit b479c3ddaf.
This commit was the result of an incorrect characterization of the
problem; see the log of commit 87c8b92 for details.
This commit is contained in:
Ludovic Courtès 2015-03-01 17:05:41 +01:00
parent 87c8b92f50
commit bbe7a2ce0c
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
guix/build/gnu-build-system.scm
View file

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